commit a373a33d33b8a5b4fd0d4c35645e2e4353ebde9b
author Nicolas Geoffray <ngeoffray@google.com> Tue Mar 22 11:09:36 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 22 11:09:37 2016 +0000
tree e739e5fe6f2f034edd91312b316c8dddd1352503
parent e2aad5d8dba805e510476ded22737a2adffbef72
parent c6b1b93f47f5694025b35e8417112b303091dc7c

Merge "Revert "Revert "Enable compilation of secondary dex files"""

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index daeb447..1d64d6d 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1873,7 +1873,7 @@
 
 void Runtime::AddCurrentRuntimeFeaturesAsDex2OatArguments(std::vector<std::string>* argv)
     const {
-  if (GetInstrumentation()->InterpretOnly() || UseJit()) {
+  if (GetInstrumentation()->InterpretOnly()) {
     argv->push_back("--compiler-filter=interpret-only");
   }
 

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index b360f67..d13d990 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -333,9 +333,17 @@
     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