From ff5d60b268dfd848c236b62ae241370a68aae39f Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Wed, 31 Jan 2018 07:36:35 +0000 Subject: [PATCH] Revert "Make AndroidRuntime only start the debugger for zygote forked apps." This reverts commit daf17d415c1a99c515ffa75f3ec3bb0fb87627fe. Reason for revert: Topic broke go/art-build. Reverting as ART Sheriff. Change-Id: I913dcb82532d448116b0c60d98a91b9b7442d5c9 --- core/jni/AndroidRuntime.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 3784d4daa2e92..d7f725d03edfc 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -761,17 +761,18 @@ 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:");