Remove assertion status from Jack sanity checks

- adds a property to set when invoking ant to disable assertion (-Dtests.disable-assertions=true)
- remove assertion status modification done in tests

(cherry picked from commit 9fcbabb82e5292b7df75ea396eddd34ea8a1558c)

Change-Id: Ibfc41fc8b0e7e47c597d3f92e420dfb151681396

1 files changed, 0 insertions, 10 deletions

diff --git a/jack/src/com/android/jack/Jack.java b/jack/src/com/android/jack/Jack.java
index 86c79a7f..1a1c2471 100644
--- a/jack/src/com/android/jack/Jack.java
+++ b/jack/src/com/android/jack/Jack.java
@@ -373,10 +373,6 @@ public abstract class Jack {
   public static void check(@Nonnull Options options, @Nonnull RunnableHooks hooks)
       throws IllegalOptionsException, ConfigurationException {
 
-    boolean assertEnable = false;
-    // assertEnable = true if assertions are already enabled
-    assert true == (assertEnable = true);
-
     if (options.proguardFlagsFiles != null && !options.proguardFlagsFiles.isEmpty()) {
       if (options.flags == null) {
         options.flags = new Flags();
@@ -401,13 +397,7 @@ public abstract class Jack {
     ThreadConfig.setConfig(config);
 
     boolean sanityChecks = config.get(Options.SANITY_CHECKS).booleanValue();
-    if (sanityChecks != assertEnable) {
-      logger.log(Level.INFO, "Jack assertion status overriden by sanity checks option");
-    }
 
-    ClassLoader classLoader = Jack.class.getClassLoader();
-    classLoader.clearAssertionStatus();
-    classLoader.setDefaultAssertionStatus(sanityChecks);
     logger.log(Level.INFO, "Jack sanity checks {0}",
         (sanityChecks ? "enabled" : "disabled"));
   }