Studio/AndroidIDE
5
0
Fork 0
mirror of https://gitee.com/zhangsken/AndroidIDE.git synced 2026-10-16 07:49:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(tooling-api): do not set custom JVM arguments to build launcher (#1807)

Browse Source
This commit is contained in:
Akash Yadav
2024-05-13 01:37:43 +05:30
parent 5bfb5de7d4
commit 2cebf4bd48
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/itsaky/androidide/services/builder/ToolingServerRunner.kt
+2
View File
@@ -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
)
subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/Main.java
-4
View File
@@ -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);