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

Commit e30f4131 authored by Alex Light's avatar Alex Light Committed by android-build-merger
Browse files

Merge "Start zygote with -Xopaque-jni-ids:swapable" am: 34bc0deb 

am: 3388ace5

Change-Id: Ic24bcf8f4a9f0f683a07ca4905c61b250c444930
parents b0ff23dd 3388ace5

core/jni/AndroidRuntime.cpp

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

    std::string fingerprintBuf;

    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];



    // Read if we are using the profile configuration, do this at the start since the last ART args
@@ -884,6 +885,14 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
                         "default");

    }



    // Only pass an explicit opaque-jni-ids to apps forked from zygote

    if (zygote) {

      parseRuntimeOption("dalvik.vm.opaque-jni-ids",

                        opaqueJniIds,

                        "-Xopaque-jni-ids:",

                        "swapable");

    }



    parseRuntimeOption("dalvik.vm.lockprof.threshold",

                       lockProfThresholdBuf,

                       "-Xlockprofthreshold:");