commit b3cef78e8d70a06e8e3d0ceb39a44a879379af3c
author David Brazdil <dbrazdil@google.com> Wed Jan 31 11:24:15 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 31 11:24:15 2018 +0000
tree 1c664fb108dd3a3b4056379102f81c2f66fdfb59
parent 2372af9cd89a30262e84c7c028068268959ed6b0
parent ff5d60b268dfd848c236b62ae241370a68aae39f

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

core/jni/AndroidRuntime.cpp

diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 3784d4d..d7f725d 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -761,17 +761,18 @@
 
     /*
      * 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:");