diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-01 20:15:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-01 20:15:59 +0000 |
| commit | 844e44c96ddb9e0167ff6dad3b7924aef29586f3 (patch) | |
| tree | ae793d1fd42939ffa5d07e3248cfdcaddb3f8eda | |
| parent | 51d58c9f216c727e35ebe2ce8fa253ca49434494 (diff) | |
| parent | 7598a248bdbeb58a4b40ad773f39137b0dde1137 (diff) | |
| download | frameworks_base-844e44c96ddb9e0167ff6dad3b7924aef29586f3.zip frameworks_base-844e44c96ddb9e0167ff6dad3b7924aef29586f3.tar.gz frameworks_base-844e44c96ddb9e0167ff6dad3b7924aef29586f3.tar.bz2 | |
am 7598a248: am e816f917: Merge "Frameworks/base: Use system property for cache prune counter"
* commit '7598a248bdbeb58a4b40ad773f39137b0dde1137':
Frameworks/base: Use system property for cache prune counter
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 0582513..b44adcb 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -552,6 +552,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) char gctypeOptsBuf[sizeof("-Xgc:")-1 + PROPERTY_VALUE_MAX]; char backgroundgcOptsBuf[sizeof("-XX:BackgroundGC=")-1 + PROPERTY_VALUE_MAX]; char heaptargetutilizationOptsBuf[sizeof("-XX:HeapTargetUtilization=")-1 + PROPERTY_VALUE_MAX]; + char cachePruneBuf[sizeof("-Xzygote-max-boot-retry=")-1 + PROPERTY_VALUE_MAX]; char dex2oatXmsImageFlagsBuf[sizeof("-Xms")-1 + PROPERTY_VALUE_MAX]; char dex2oatXmxImageFlagsBuf[sizeof("-Xmx")-1 + PROPERTY_VALUE_MAX]; char dex2oatXmsFlagsBuf[sizeof("-Xms")-1 + PROPERTY_VALUE_MAX]; @@ -815,6 +816,10 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) addOption(nativeBridgeLibrary); } + // Dalvik-cache pruning counter. + parseRuntimeOption("dalvik.vm.zygote.max-boot-retry", cachePruneBuf, + "-Xzygote-max-boot-retry="); + initArgs.version = JNI_VERSION_1_4; initArgs.options = mOptions.editArray(); initArgs.nOptions = mOptions.size(); |