Merge "Add dalvik.vm.force-java-zygote-fork-loop" am: a8540eebc3 am: 12f589735b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1747950

Change-Id: If85e48ca5743b5fd1bf8e1b36fbcb1372ec1b1f3
This commit is contained in:
Hans Boehm
2021-07-01 23:36:19 +00:00
committed by Automerger Merge Worker

View File

@@ -690,6 +690,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p
char methodTraceFileBuf[sizeof("-Xmethod-trace-file:") + PROPERTY_VALUE_MAX];
char methodTraceFileSizeBuf[sizeof("-Xmethod-trace-file-size:") + PROPERTY_VALUE_MAX];
std::string fingerprintBuf;
char javaZygoteForkLoopBuf[sizeof("-XX:ForceJavaZygoteForkLoop=") + PROPERTY_VALUE_MAX];
char jdwpProviderBuf[sizeof("-XjdwpProvider:") - 1 + PROPERTY_VALUE_MAX];
char opaqueJniIds[sizeof("-Xopaque-jni-ids:") - 1 + PROPERTY_VALUE_MAX];
char bootImageBuf[sizeof("-Ximage:") - 1 + PROPERTY_VALUE_MAX];
@@ -907,6 +908,13 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p
parseRuntimeOption("dalvik.vm.backgroundgctype", backgroundgcOptsBuf, "-XX:BackgroundGC=");
/*
* Enable/disable zygote native fork loop.
*/
parseRuntimeOption("dalvik.vm.force-java-zygote-fork-loop",
javaZygoteForkLoopBuf,
"-XX:ForceJavaZygoteForkLoop=");
/*
* Enable debugging only for apps forked from zygote.
*/