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

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

Merge "Add dalvik.vm.force-java-zygote-fork-loop" am: a8540eeb 

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

Change-Id: I153aaaec36f1031cf952b94d9cd4291c5d3997d5
parents 7fc08420 a8540eeb

core/jni/AndroidRuntime.cpp

+8 −0
Original line number Original line Diff line number Diff line
@@ -681,6 +681,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
    char methodTraceFileBuf[sizeof("-Xmethod-trace-file:") + PROPERTY_VALUE_MAX];

    char methodTraceFileBuf[sizeof("-Xmethod-trace-file:") + PROPERTY_VALUE_MAX];

    char methodTraceFileSizeBuf[sizeof("-Xmethod-trace-file-size:") + PROPERTY_VALUE_MAX];

    char methodTraceFileSizeBuf[sizeof("-Xmethod-trace-file-size:") + PROPERTY_VALUE_MAX];

    std::string fingerprintBuf;

    std::string fingerprintBuf;

    char javaZygoteForkLoopBuf[sizeof("-XX:ForceJavaZygoteForkLoop=") + PROPERTY_VALUE_MAX];

    char jdwpProviderBuf[sizeof("-XjdwpProvider:") - 1 + PROPERTY_VALUE_MAX];

    char jdwpProviderBuf[sizeof("-XjdwpProvider:") - 1 + PROPERTY_VALUE_MAX];

    char opaqueJniIds[sizeof("-Xopaque-jni-ids:") - 1 + PROPERTY_VALUE_MAX];

    char opaqueJniIds[sizeof("-Xopaque-jni-ids:") - 1 + PROPERTY_VALUE_MAX];

    char bootImageBuf[sizeof("-Ximage:") - 1 + PROPERTY_VALUE_MAX];

    char bootImageBuf[sizeof("-Ximage:") - 1 + PROPERTY_VALUE_MAX];
@@ -898,6 +899,13 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 




    parseRuntimeOption("dalvik.vm.backgroundgctype", backgroundgcOptsBuf, "-XX:BackgroundGC=");

    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.

     * Enable debugging only for apps forked from zygote.

     */

     */