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

This commit is contained in:
David Brazdil
2018-01-31 11:24:15 +00:00
committed by Gerrit Code Review

View File

@@ -761,16 +761,17 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote)
/* /*
* Enable debugging only for apps forked from zygote. * Enable debugging only for apps forked from zygote.
* Set suspend=y to pause during VM init and use android ADB transport.
*/ */
if (zygote) { 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"); addOption("-XjdwpOptions:suspend=n,server=y");
}
// Set the JDWP provider. By default let the runtime choose.
parseRuntimeOption("dalvik.vm.jdwp-provider", parseRuntimeOption("dalvik.vm.jdwp-provider",
jdwpProviderBuf, jdwpProviderBuf,
"-XjdwpProvider:", "-XjdwpProvider:",
"default"); "default");
}
parseRuntimeOption("dalvik.vm.lockprof.threshold", parseRuntimeOption("dalvik.vm.lockprof.threshold",
lockProfThresholdBuf, lockProfThresholdBuf,