diff options
author | Neil Fuller <nfuller@google.com> | 2018-02-19 12:00:15 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-02-19 12:00:15 +0000 |
commit | ccf18e064e312377067bdfea746ec85f8375f19a (patch) | |
tree | c68b87bfe06019cdb53b504d887099a084008079 | |
parent | 68172702c9d5d871aeffb67a65dd955dc20d35cf (diff) | |
parent | f2786938c179f64b28241b77ebf4dbf153368ba7 (diff) | |
download | vogar-pie-b4s4-dev.tar.gz |
Fix --debug in vogar am: 467c0c239a am: 41df6fa8caandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
am: f2786938c1
Change-Id: Ief073c3b8406375852ab77c3cbce865c2bd6be0f
-rw-r--r-- | src/vogar/JavaVm.java | 7 | ||||
-rw-r--r-- | src/vogar/android/DeviceRuntime.java | 5 | ||||
-rw-r--r-- | src/vogar/android/HostRuntime.java | 5 | ||||
-rw-r--r-- | src/vogar/commands/VmCommandBuilder.java | 10 | ||||
-rw-r--r-- | src/vogar/tasks/RunActionTask.java | 1 |
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) |