Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit feb8b66d authored by Hans Boehm's avatar Hans Boehm Committed by Automerger Merge Worker
Browse files

Merge "Add dalvik.vm.force-java-zygote-fork-loop" into sc-dev am: aa83e6ae 

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

Change-Id: If76fa0ad91d7bc734db39677e07ffc695a61a358
parents 4383b070 aa83e6ae

core/jni/AndroidRuntime.cpp

+8 −0
Original line number Diff line number Diff line
@@ -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];
@@ -912,6 +913,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.

     */