diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-03-19 17:06:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-19 17:06:43 +0000 |
| commit | 543a3578ad0a1d0214b9102ddec0fc26a0e5d63e (patch) | |
| tree | e40a851680eb8039837c16aedf12d5239a5b3587 | |
| parent | 81449237141b01329543460f8faf43a74b5b9ce0 (diff) | |
| parent | 05844d573f33c77cd7bb608a118a998506a6996d (diff) | |
| download | frameworks_base-543a3578ad0a1d0214b9102ddec0fc26a0e5d63e.zip frameworks_base-543a3578ad0a1d0214b9102ddec0fc26a0e5d63e.tar.gz frameworks_base-543a3578ad0a1d0214b9102ddec0fc26a0e5d63e.tar.bz2 | |
am 05844d57: am b7d997a7: Merge "Revert "Change jit properties to be debug properties""
* commit '05844d573f33c77cd7bb608a118a998506a6996d':
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 2327899..441af15 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("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) { |