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

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

Merge "Make AndroidRuntime only start the debugger for zygote forked apps."...

Merge "Make AndroidRuntime only start the debugger for zygote forked apps." am: 5cdf28f3 am: 710b7c66
am: b65fecd8

Change-Id: Iddea47fca8954f435c81a63695efdbd18aa30a66
parents df8ec9fc b65fecd8
Loading
Loading
Loading
Loading
+6 −7
Original line number Diff line number Diff line
@@ -765,17 +765,16 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote)

    /*
     * Enable debugging only for apps forked from zygote.
     * Set suspend=y to pause during VM init and use android ADB transport.
     */
    if (zygote) {
      // Set the JDWP provider and required arguments. By default let the runtime choose how JDWP is
      // implemented. When this is not set the runtime defaults to not allowing JDWP.
      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,