Skip to content
This repository was archived by the owner on Oct 18, 2024. It is now read-only.

Commit 2cebf4b

Browse files
committed
fix(tooling-api): do not set custom JVM arguments to build launcher (#1807)
1 parent 5bfb5de commit 2cebf4b

File tree

2 files changed

+2
-4
lines changed
  • app/src/main/java/com/itsaky/androidide/services/builder
  • subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl

2 files changed

+2
-4
lines changed

app/src/main/java/com/itsaky/androidide/services/builder/ToolingServerRunner.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package com.itsaky.androidide.services.builder
1919

20+
import ch.qos.logback.core.CoreConstants
2021
import com.itsaky.androidide.shell.executeProcessAsync
2122
import com.itsaky.androidide.tasks.cancelIfActive
2223
import com.itsaky.androidide.tasks.ifCancelledOrInterrupted
@@ -89,6 +90,7 @@ internal class ToolingServerRunner(
8990
"--add-opens", "java.base/java.lang=ALL-UNNAMED", "--add-opens",
9091
"java.base/java.util=ALL-UNNAMED", "--add-opens",
9192
"java.base/java.io=ALL-UNNAMED", // The JAR file to run
93+
"-D${CoreConstants.STATUS_LISTENER_CLASS_KEY}=com.itsaky.androidide.tooling.impl.util.LogbackStatusListener",
9294
"-jar", Environment.TOOLING_API_JAR.absolutePath
9395
)
9496

subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/Main.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@
1717

1818
package com.itsaky.androidide.tooling.impl;
1919

20-
import ch.qos.logback.core.CoreConstants;
2120
import com.itsaky.androidide.logging.JvmStdErrAppender;
2221
import com.itsaky.androidide.tooling.api.IToolingApiClient;
2322
import com.itsaky.androidide.tooling.api.util.ToolingApiLauncher;
2423
import com.itsaky.androidide.tooling.impl.internal.ProjectImpl;
2524
import com.itsaky.androidide.tooling.impl.progress.ForwardingProgressListener;
26-
import com.itsaky.androidide.tooling.impl.util.LogbackStatusListener;
2725
import java.io.ByteArrayInputStream;
2826
import java.nio.charset.StandardCharsets;
2927
import java.util.HashSet;
@@ -124,8 +122,6 @@ public static void finalizeLauncher(ConfigurableLauncher<?> launcher) {
124122
args.removeIf(String::isBlank);
125123

126124
LOG.debug("Arguments from tooling client: {}", args);
127-
launcher.addJvmArguments("-D" + CoreConstants.STATUS_LISTENER_CLASS_KEY + "="
128-
+ LogbackStatusListener.class.getName());
129125
launcher.addArguments(args);
130126
} catch (Throwable e) {
131127
LOG.error("Unable to get build arguments from tooling client", e);

0 commit comments

Comments
 (0)