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

Commit 13eec469 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Add support for selecting alternate JDWP implementations" am:... 

Merge "Merge "Add support for selecting alternate JDWP implementations" am: cbeea238 am: f5ec7f2e am: b24c17ef"
parents 54839e0d 3ee64f8d

core/jni/AndroidRuntime.cpp

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

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

    std::string fingerprintBuf;

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



    bool checkJni = false;

    property_get("dalvik.vm.checkjni", propBuf, "");
@@ -768,9 +769,15 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
     * Set suspend=y to pause during VM init and use android ADB transport.

     */

    if (zygote) {

      addOption("-agentlib:jdwp=transport=dt_android_adb,suspend=n,server=y");

      addOption("-XjdwpOptions:suspend=n,server=y");

    }



    // Set the JDWP provider. By default let the runtime choose.

    parseRuntimeOption("dalvik.vm.jdwp-provider",

                       jdwpProviderBuf,

                       "-XjdwpProvider:",

                       "default");



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

                       lockProfThresholdBuf,

                       "-Xlockprofthreshold:");