Snap for 4612226 from ccf18e064e312377067bdfea746ec85f8375f19a to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release

Change-Id: I15a11bf4a170dda7e6f7b02416f382f07460cdd0

5 files changed, 14 insertions, 14 deletions

diff --git a/src/vogar/JavaVm.java b/src/vogar/JavaVm.java
index b23adec..81cc18f 100644
--- a/src/vogar/JavaVm.java
+++ b/src/vogar/JavaVm.java
@@ -44,9 +44,14 @@ final class JavaVm implements Mode {
         List<String> vmCommand = new ArrayList<String>();
         Iterables.addAll(vmCommand, run.invokeWith());
         vmCommand.add(run.javaPath(run.vmCommand));
-        return new VmCommandBuilder(run.log)
+        VmCommandBuilder vmCommandBuilder = new VmCommandBuilder(run.log)
                 .userDir(workingDirectory)
                 .vmCommand(vmCommand);
+        if (run.debugPort != null) {
+            vmCommandBuilder.vmArgs("-Xrunjdwp:transport=dt_socket,address="
+                    + run.debugPort + ",server=y,suspend=y");
+        }
+        return vmCommandBuilder;
     }
 
     @Override public Task executeActionTask(Action action, boolean useLargeTimeout) {
diff --git a/src/vogar/android/DeviceRuntime.java b/src/vogar/android/DeviceRuntime.java
index 616c254..1c85793 100644
--- a/src/vogar/android/DeviceRuntime.java
+++ b/src/vogar/android/DeviceRuntime.java
@@ -89,7 +89,10 @@ public final class DeviceRuntime implements Mode {
                 // _adb_connect in system/core/adb/adb_client.cpp).
                 .maxLength(4096);
         if (run.debugPort != null) {
-            vmCommandBuilder.vmArgs("-Xcompiler-option", "--debuggable");
+            vmCommandBuilder.vmArgs(
+                    "-Xcompiler-option", "--debuggable", "-Xplugin:libopenjdkjvmti.so",
+                    "-agentpath:libjdwp.so=transport=dt_socket,address=" + run.debugPort
+                            + ",server=y,suspend=y");
         }
 
         if (modeId == ModeId.APP_PROCESS) {
diff --git a/src/vogar/android/HostRuntime.java b/src/vogar/android/HostRuntime.java
index 5547718..948be55 100644
--- a/src/vogar/android/HostRuntime.java
+++ b/src/vogar/android/HostRuntime.java
@@ -136,7 +136,10 @@ public final class HostRuntime implements Mode {
                 .vmArgs("-Duser.language=en")
                 .vmArgs("-Duser.region=US");
         if (run.debugPort != null) {
-            builder.vmArgs("-Xcompiler-option", "--debuggable");
+            builder.vmArgs(
+                    "-Xcompiler-option", "--debuggable", "-Xplugin:libopenjdkjvmti.so",
+                    "-agentpath:libjdwp.so=transport=dt_socket,address=" + run.debugPort
+                            + ",server=y,suspend=y");
         }
         if (!run.benchmark && run.checkJni) {
             builder.vmArgs("-Xcheck:jni");
diff --git a/src/vogar/commands/VmCommandBuilder.java b/src/vogar/commands/VmCommandBuilder.java
index c532984..fc26cdb 100644
--- a/src/vogar/commands/VmCommandBuilder.java
+++ b/src/vogar/commands/VmCommandBuilder.java
@@ -105,11 +105,6 @@ public final class VmCommandBuilder {
         return this;
     }
 
-    public VmCommandBuilder debugPort(Integer debugPort) {
-        this.debugPort = debugPort;
-        return this;
-    }
-
     public VmCommandBuilder mainClass(String mainClass) {
         this.mainClass = mainClass;
         return this;
@@ -174,11 +169,6 @@ public final class VmCommandBuilder {
             builder.tokens("-Djava.io.tmpdir=" + temp);
         }
 
-        if (debugPort != null) {
-            builder.tokens("-Xrunjdwp:transport=dt_socket,address="
-                    + debugPort + ",server=y,suspend=y");
-        }
-
         builder.tokens(vmArgs);
         builder.tokens(mainClass);
         builder.tokens(args);
diff --git a/src/vogar/tasks/RunActionTask.java b/src/vogar/tasks/RunActionTask.java
index 6965676..01b659d 100644
--- a/src/vogar/tasks/RunActionTask.java
+++ b/src/vogar/tasks/RunActionTask.java
@@ -169,7 +169,6 @@ public class RunActionTask extends Task implements HostMonitor.Handler {
         }
         return vmCommandBuilder
                 .temp(workingDirectory)
-                .debugPort(run.debugPort)
                 .vmArgs(run.additionalVmArgs)
                 .mainClass(TestRunner.class.getName())
                 .args(run.targetArgs)