diff --git a/app/src/main/java/com/itsaky/androidide/services/builder/ToolingServerRunner.kt b/app/src/main/java/com/itsaky/androidide/services/builder/ToolingServerRunner.kt index b5c6c9c92..f8e7489f5 100644 --- a/app/src/main/java/com/itsaky/androidide/services/builder/ToolingServerRunner.kt +++ b/app/src/main/java/com/itsaky/androidide/services/builder/ToolingServerRunner.kt @@ -17,6 +17,7 @@ package com.itsaky.androidide.services.builder +import ch.qos.logback.core.CoreConstants import com.itsaky.androidide.shell.executeProcessAsync import com.itsaky.androidide.tasks.cancelIfActive import com.itsaky.androidide.tasks.ifCancelledOrInterrupted @@ -89,6 +90,7 @@ internal class ToolingServerRunner( "--add-opens", "java.base/java.lang=ALL-UNNAMED", "--add-opens", "java.base/java.util=ALL-UNNAMED", "--add-opens", "java.base/java.io=ALL-UNNAMED", // The JAR file to run + "-D${CoreConstants.STATUS_LISTENER_CLASS_KEY}=com.itsaky.androidide.tooling.impl.util.LogbackStatusListener", "-jar", Environment.TOOLING_API_JAR.absolutePath ) diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/Main.java b/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/Main.java index 4e2032c32..11c9edc78 100644 --- a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/Main.java +++ b/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/Main.java @@ -17,13 +17,11 @@ package com.itsaky.androidide.tooling.impl; -import ch.qos.logback.core.CoreConstants; import com.itsaky.androidide.logging.JvmStdErrAppender; import com.itsaky.androidide.tooling.api.IToolingApiClient; import com.itsaky.androidide.tooling.api.util.ToolingApiLauncher; import com.itsaky.androidide.tooling.impl.internal.ProjectImpl; import com.itsaky.androidide.tooling.impl.progress.ForwardingProgressListener; -import com.itsaky.androidide.tooling.impl.util.LogbackStatusListener; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; import java.util.HashSet; @@ -124,8 +122,6 @@ public class Main { args.removeIf(String::isBlank); LOG.debug("Arguments from tooling client: {}", args); - launcher.addJvmArguments("-D" + CoreConstants.STATUS_LISTENER_CLASS_KEY + "=" - + LogbackStatusListener.class.getName()); launcher.addArguments(args); } catch (Throwable e) { LOG.error("Unable to get build arguments from tooling client", e);