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

Commit c50928b7 authored by Alex Light's avatar Alex Light
Browse files

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

This reverts commit ff5d60b2.

Reason for revert: Fixed issue breaking go/art-build.

Bug: 72400560
Test: Build
Change-Id: Ie8943068302bec02d149917ccf738c0d935f8fe0
parent ff5d60b2

core/jni/AndroidRuntime.cpp

+6 −7
Original line number Diff line number Diff line
@@ -761,17 +761,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,