Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: b3cef78e8d

Change-Id: I489a9ed838033ba72a62fb6241093b89b3fb54b2
This commit is contained in:
David Brazdil
2018-01-31 13:20:42 +00:00
committed by android-build-merger
parent 476b746360 b3cef78e8d
commit e49f4ef9fa
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/AndroidRuntime.cpp
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,