Revert "Enable compilation of secondary dex files"

Reverting until we fix the buildbot failures on jdwp and libcore.

Bug: 26719109

This reverts commit 770b39eb564ec16c672ace83515535b055edb2b1.

Change-Id: Ifba366d2ddc9311737b6ea29c007475a40cc803f

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 4b45b42..c2d2dca 100644 (file)
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1883,7 +1883,7 @@ void Runtime::SetFaultMessage(const std::string& message) {
 
 void Runtime::AddCurrentRuntimeFeaturesAsDex2OatArguments(std::vector<std::string>* argv)
     const {
-  if (GetInstrumentation()->InterpretOnly()) {
+  if (GetInstrumentation()->InterpretOnly() || UseJit()) {
     argv->push_back("--compiler-filter=interpret-only");
   }
 

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 762d9a4..2db1e6c 100755 (executable)
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -329,17 +329,9 @@ if [ "$JIT" = "y" ]; then
     INT_OPTS="-Xusejit:true"
     if [ "$VERIFY" = "y" ] ; then
       COMPILE_FLAGS="${COMPILE_FLAGS} --compiler-filter=verify-at-runtime"
-      if [ "$PREBUILD" = "n" ]; then
-        # Make sure that if we have noprebuild we still JIT as DexClassLoader will
-        # try to compile the dex file.
-        INT_OPTS="${INT_OPTS} -Xcompiler-option --compiler-filter=verify-at-runtime"
-      fi
     else
       COMPILE_FLAGS="${COMPILE_FLAGS} --compiler-filter=verify-none"
       DEX_VERIFY="${DEX_VERIFY} -Xverify:none"
-      if [ "$PREBUILD" = "n" ]; then
-        INT_OPTS="${INT_OPTS} -Xcompiler-option --compiler-filter=verify-none"
-      fi
     fi
 fi