Revert "Revert "Add "linkage" test options""

This reverts commit 91a8e6f60c508c6e010b6ef8e4056e3a6f04c447.

Reason for revert: Moved tests to gtest and under compilation only.

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

1 files changed, 15 insertions, 0 deletions

diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h
index 79ba1c27c9..639c5475e8 100644
--- a/compiler/driver/compiler_options.h
+++ b/compiler/driver/compiler_options.h
@@ -311,6 +311,14 @@ class CompilerOptions final {
     return force_determinism_;
   }
 
+  bool IsCheckLinkageConditions() const {
+    return check_linkage_conditions_;
+  }
+
+  bool IsCrashOnLinkageViolation() const {
+    return crash_on_linkage_violation_;
+  }
+
   bool DeduplicateCode() const {
     return deduplicate_code_;
   }
@@ -431,6 +439,13 @@ class CompilerOptions final {
   // outcomes.
   bool force_determinism_;
 
+  // Whether the compiler should check for violation of the conditions required to perform AOT
+  // "linkage".
+  bool check_linkage_conditions_;
+  // Whether the compiler should crash when encountering a violation of one of
+  // the conditions required to perform AOT "linkage".
+  bool crash_on_linkage_violation_;
+
   // Whether code should be deduplicated.
   bool deduplicate_code_;