commit d98a52f0bc6c58e8e538de8335ab9bcb6ae73aa7
author Nicolas Geoffray <ngeoffray@google.com> Mon Mar 14 15:54:39 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Mar 14 15:54:39 2016 +0000
tree 4490895063571fb10eac32ba0b4a2a5b8a749c14
parent 770b39eb564ec16c672ace83515535b055edb2b1

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

runtime/runtime.cc

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