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

Commit 434bee35 authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge "Revert "Make AndroidRuntime only start the debugger for zygote forked apps."" am: b3cef78e 

am: e49f4ef9

Change-Id: Iea3ba9377f0a4cc5a6056e6a6116206d95a19d66
parents ebadd8ac e49f4ef9

core/jni/AndroidRuntime.cpp

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