Merge "Frameworks/base: Use system property for cache prune counter"
This commit is contained in:
@@ -552,6 +552,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
|
|||||||
char gctypeOptsBuf[sizeof("-Xgc:")-1 + PROPERTY_VALUE_MAX];
|
char gctypeOptsBuf[sizeof("-Xgc:")-1 + PROPERTY_VALUE_MAX];
|
||||||
char backgroundgcOptsBuf[sizeof("-XX:BackgroundGC=")-1 + PROPERTY_VALUE_MAX];
|
char backgroundgcOptsBuf[sizeof("-XX:BackgroundGC=")-1 + PROPERTY_VALUE_MAX];
|
||||||
char heaptargetutilizationOptsBuf[sizeof("-XX:HeapTargetUtilization=")-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 dex2oatXmsImageFlagsBuf[sizeof("-Xms")-1 + PROPERTY_VALUE_MAX];
|
||||||
char dex2oatXmxImageFlagsBuf[sizeof("-Xmx")-1 + PROPERTY_VALUE_MAX];
|
char dex2oatXmxImageFlagsBuf[sizeof("-Xmx")-1 + PROPERTY_VALUE_MAX];
|
||||||
char dex2oatXmsFlagsBuf[sizeof("-Xms")-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);
|
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.version = JNI_VERSION_1_4;
|
||||||
initArgs.options = mOptions.editArray();
|
initArgs.options = mOptions.editArray();
|
||||||
initArgs.nOptions = mOptions.size();
|
initArgs.nOptions = mOptions.size();
|
||||||
|
|||||||
Reference in New Issue
Block a user