commit fe57c2b63df652fe4eefd750e3566309bfe038fb
author David Sehr <sehr@google.com> Fri Mar 27 14:58:54 2020 +0000
committer David Sehr <sehr@google.com> Fri Mar 27 19:23:23 2020 +0000
tree 839ff604e8baae86458642803bc2738d0ab7b5e3
parent a467a6e81f5c6da589a5fb16fdb85f2604860623

Revert^4 "Add "linkage" test options""

This reverts commit 16c08ca97486f535698f1a1b17f0332bfe78e95a.

Reason for revert: Disabled on device testing

Change-Id: I8d5442e0ebb6383ebfbce98f1857b5e844e0d5e1
Bug: none
Test: make test-art-host-gtest-dex2oat_test

dex2oat/dex2oat_options.def

diff --git a/dex2oat/dex2oat_options.def b/dex2oat/dex2oat_options.def
index f48806c..e324e8b 100644
--- a/dex2oat/dex2oat_options.def
+++ b/dex2oat/dex2oat_options.def
@@ -91,5 +91,7 @@
 DEX2OAT_OPTIONS_KEY (std::string,                    DirtyImageObjects)
 DEX2OAT_OPTIONS_KEY (std::vector<std::string>,       RuntimeOptions)
 DEX2OAT_OPTIONS_KEY (std::string,                    CompilationReason)
+DEX2OAT_OPTIONS_KEY (Unit,                           CheckLinkageConditions)
+DEX2OAT_OPTIONS_KEY (Unit,                           CrashOnLinkageViolation)
 
 #undef DEX2OAT_OPTIONS_KEY