summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2015-03-19 16:44:58 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-19 16:44:59 +0000
commitb7d997a7b79c233869fdd5ad18b013caad4a7236 (patch)
tree20119c24b9a32ae480ddffe8da202f4249bed56c
parent4177b8cbbfa239d68a9283124638d9399a5dd0de (diff)
parent1fb7aab9b235fa526a1b8e6e2efd71c7df66096d (diff)
downloadframeworks_base-b7d997a7b79c233869fdd5ad18b013caad4a7236.zip
frameworks_base-b7d997a7b79c233869fdd5ad18b013caad4a7236.tar.gz
frameworks_base-b7d997a7b79c233869fdd5ad18b013caad4a7236.tar.bz2
Merge "Revert "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 516bb65..ce50d96 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -648,9 +648,9 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
/*
* JIT related options.
*/
- parseRuntimeOption("debug.dalvik.vm.usejit", usejitOptsBuf, "-Xusejit:");
- parseRuntimeOption("debug.dalvik.vm.jitcodecachesize", jitcodecachesizeOptsBuf, "-Xjitcodecachesize:");
- parseRuntimeOption("debug.dalvik.vm.jitthreshold", jitthresholdOptsBuf, "-Xjitthreshold:");
+ parseRuntimeOption("dalvik.vm.usejit", usejitOptsBuf, "-Xusejit:");
+ parseRuntimeOption("dalvik.vm.jitcodecachesize", jitcodecachesizeOptsBuf, "-Xjitcodecachesize:");
+ parseRuntimeOption("dalvik.vm.jitthreshold", jitthresholdOptsBuf, "-Xjitthreshold:");
property_get("ro.config.low_ram", propBuf, "");
if (strcmp(propBuf, "true") == 0) {