summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2015-03-17 14:47:24 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-03-17 14:47:24 +0000
commit6f6f825ebbea34255c69c0a6480f128348ec9bb6 (patch)
tree26d39c88edfcc0d2943889b116e8764a2e008c16
parent11b07c05ac5d2c3e9c4a4f5c83047091ed8e50bc (diff)
parent5ec7c78d52a5a01ed1755ad8b8e486e4c6f05a93 (diff)
am 5ec7c78d: am 008ec61e: Merge "Change jit properties to be debug properties"
* commit '5ec7c78d52a5a01ed1755ad8b8e486e4c6f05a93': Change jit properties to be debug properties
-rw-r--r--core/jni/AndroidRuntime.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 441af153b1bd..2327899e5d63 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -649,9 +649,9 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
/*
* JIT related options.
*/
- parseRuntimeOption("dalvik.vm.usejit", usejitOptsBuf, "-Xusejit:");
- parseRuntimeOption("dalvik.vm.jitcodecachesize", jitcodecachesizeOptsBuf, "-Xjitcodecachesize:");
- parseRuntimeOption("dalvik.vm.jitthreshold", jitthresholdOptsBuf, "-Xjitthreshold:");
+ parseRuntimeOption("debug.dalvik.vm.usejit", usejitOptsBuf, "-Xusejit:");
+ parseRuntimeOption("debug.dalvik.vm.jitcodecachesize", jitcodecachesizeOptsBuf, "-Xjitcodecachesize:");
+ parseRuntimeOption("debug.dalvik.vm.jitthreshold", jitthresholdOptsBuf, "-Xjitthreshold:");
property_get("ro.config.low_ram", propBuf, "");
if (strcmp(propBuf, "true") == 0) {