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

This reverts commit ff5d60b268.

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

Bug: 72400560
Test: Build
Change-Id: Ie8943068302bec02d149917ccf738c0d935f8fe0
This commit is contained in:
Alex Light
2018-01-31 16:47:29 +00:00
parent ff5d60b268
commit c50928b763

View File

@@ -761,18 +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");
parseRuntimeOption("dalvik.vm.jdwp-provider",
jdwpProviderBuf,
"-XjdwpProvider:",
"default");
}
// 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:");