diff options
| author | 2016-03-14 15:54:54 +0000 | |
|---|---|---|
| committer | 2016-03-14 15:54:55 +0000 | |
| commit | e70cda6147e2e49384a219b167a6c734a8db28f5 (patch) | |
| tree | ea627d88f7423c50b0ba7d2627c09f970a86f91f | |
| parent | 14cc147fbd09d5ef0ba5c724a7287ac6770ae330 (diff) | |
| parent | d98a52f0bc6c58e8e538de8335ab9bcb6ae73aa7 (diff) | |
Merge "Revert "Enable compilation of secondary dex files""
| -rw-r--r-- | runtime/runtime.cc | 2 | ||||
| -rwxr-xr-x | test/etc/run-test-jar | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index fd6cc100eb..e95f2c539f 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -1866,7 +1866,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 762d9a45ee..2db1e6c947 100755 --- 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 |