commit e722d2921615102941ca4b6717c9d9e1edae1192
author Nicolas Geoffray <ngeoffray@google.com> Tue Dec 15 11:51:37 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Dec 15 11:51:37 2015 +0000
tree b6cb4205b3c6065029085132125bf6e935d1f7a2
parent 0a9b6826bc6e71d799eb3fe8829981597b890dee

Revert "Make the JIT the default in ART."

Few tests failing: oat_file_assistant_test and jit run tests.

This reverts commit 0a9b6826bc6e71d799eb3fe8829981597b890dee.

Change-Id: Ibbf73c191d244ebb9517b6ae97971dd9a9d37d7c

runtime/runtime_options.def

diff --git a/runtime/runtime_options.def b/runtime/runtime_options.def
index cced31c..5624285 100644
--- a/runtime/runtime_options.def
+++ b/runtime/runtime_options.def
@@ -66,7 +66,7 @@
 RUNTIME_OPTIONS_KEY (Unit,                LowMemoryMode)
 RUNTIME_OPTIONS_KEY (bool,                UseTLAB,                        (kUseTlab || kUseReadBarrier))
 RUNTIME_OPTIONS_KEY (bool,                EnableHSpaceCompactForOOM,      true)
-RUNTIME_OPTIONS_KEY (bool,                UseJIT,                         true)
+RUNTIME_OPTIONS_KEY (bool,                UseJIT,                         false)
 RUNTIME_OPTIONS_KEY (unsigned int,        JITCompileThreshold,            jit::Jit::kDefaultCompileThreshold)
 RUNTIME_OPTIONS_KEY (unsigned int,        JITWarmupThreshold,             jit::Jit::kDefaultWarmupThreshold)
 RUNTIME_OPTIONS_KEY (MemoryKiB,           JITCodeCacheInitialCapacity,    jit::JitCodeCache::kInitialCapacity)
@@ -80,7 +80,7 @@
 RUNTIME_OPTIONS_KEY (std::string,         JniTrace)
 RUNTIME_OPTIONS_KEY (std::string,         PatchOat)
 RUNTIME_OPTIONS_KEY (bool,                Relocate,                       kDefaultMustRelocate)
-RUNTIME_OPTIONS_KEY (bool,                Dex2Oat,                        false)
+RUNTIME_OPTIONS_KEY (bool,                Dex2Oat,                        true)
 RUNTIME_OPTIONS_KEY (bool,                ImageDex2Oat,                   true)
 RUNTIME_OPTIONS_KEY (bool,                Interpret,                      false) // -Xint
                                                         // Disable the compiler for CC (for now).