diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-03-19 16:58:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-19 16:58:59 +0000 |
| commit | 05844d573f33c77cd7bb608a118a998506a6996d (patch) | |
| tree | e451ff0f1b3982cb228bffd2e04d19742bccedcd | |
| parent | d71f548f4803f0696af7de9a2989673cfd83800f (diff) | |
| parent | b7d997a7b79c233869fdd5ad18b013caad4a7236 (diff) | |
| download | frameworks_base-05844d573f33c77cd7bb608a118a998506a6996d.zip frameworks_base-05844d573f33c77cd7bb608a118a998506a6996d.tar.gz frameworks_base-05844d573f33c77cd7bb608a118a998506a6996d.tar.bz2 | |
am b7d997a7: Merge "Revert "Change jit properties to be debug properties""
* commit 'b7d997a7b79c233869fdd5ad18b013caad4a7236':
Revert "Change jit properties to be debug properties"
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 6 |
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) { |