diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-01 15:57:17 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-04-01 15:57:17 -0700 |
| commit | ac038f3b69724647e9ff7b115eea77d442c9d0f5 (patch) | |
| tree | b5d669d0830c9c8c22cf079a6d2c2650c4e2f3bc /core/jni/AndroidRuntime.cpp | |
| parent | bb664e12e2539c4e8121764a891e000d52e9664f (diff) | |
| parent | 844e44c96ddb9e0167ff6dad3b7924aef29586f3 (diff) | |
| download | frameworks_base-ac038f3b69724647e9ff7b115eea77d442c9d0f5.zip frameworks_base-ac038f3b69724647e9ff7b115eea77d442c9d0f5.tar.gz frameworks_base-ac038f3b69724647e9ff7b115eea77d442c9d0f5.tar.bz2 | |
resolved conflicts for merge of 844e44c9 to master
Change-Id: I8f682da1a50151547f01b4d3a949852525fe6299
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
| -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 a4c91b3..f1b04a5 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]; @@ -829,6 +830,10 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) snprintf(cpuAbiListBuf, sizeof(cpuAbiListBuf), "--cpu-abilist=%s", propBuf); addOption(cpuAbiListBuf); + // 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(); |