Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-30 12:31:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-2979_Dan_GADPUseSameJava'

Browse Source
This commit is contained in:
Ryan Kurtz
2023-01-19 06:13:36 -05:00
parent 4c652101a0 34aabc7edb
commit 5195aaebc1
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/server/AbstractGadpLocalDebuggerModelFactory.java
+5 -2
View File
@@ -113,8 +113,11 @@ public abstract class AbstractGadpLocalDebuggerModelFactory implements DebuggerM
try { try {
ProcessBuilder builder = new ProcessBuilder(); ProcessBuilder builder = new ProcessBuilder();
List<String> cmd = new ArrayList<>(); List<String> cmd = new ArrayList<>();
cmd.add("java"); String javaCommand = System.getProperty("java.home") + File.separator + "bin" +
cmd.addAll(List.of("-cp", System.getProperty("java.class.path"))); File.separator + "java";
cmd.add(javaCommand);
cmd.add("-cp");
cmd.add(System.getProperty("java.class.path"));
if (jdwpPort >= 0) { if (jdwpPort >= 0) {
cmd.add("-agentlib:jdwp=server=y,transport=dt_socket,address=" + jdwpPort + cmd.add("-agentlib:jdwp=server=y,transport=dt_socket,address=" + jdwpPort +
",suspend=" + (jdwpSuspend ? "y" : "n")); ",suspend=" + (jdwpSuspend ? "y" : "n"));