Skip to content

Sanitize tooling server JVM environment #1356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ReigenArataka-jp wants to merge 2 commits into
base: stage
Choose a base branch
from
+26 −7
Open

Sanitize tooling server JVM environment #1356

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baf651f
Sanitize tooling server JVM environment
ReigenArataka-jp Jun 1, 2026
610f0ed
Merge branch 'stage' into sanitize-tooling-env
ReigenArataka-jp Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions app/src/main/java/com/itsaky/androidide/services/builder/ToolingServerRunner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package com.itsaky.androidide.services.builder

import ch.qos.logback.core.CoreConstants
import com.itsaky.androidide.logging.JvmStdErrAppender
import com.itsaky.androidide.shell.executeProcessAsync
import com.itsaky.androidide.tasks.cancelIfActive
import com.itsaky.androidide.tasks.ifCancelledOrInterrupted
import com.itsaky.androidide.tooling.api.IToolingApiClient
Expand Down Expand Up @@ -80,6 +79,20 @@ internal class ToolingServerRunner(
* forcibly killing the daemon process tree if it's still alive.
*/
val TOOLING_DAEMON_KILL_TIMEOUT = 3.seconds

/**
* Android/ART classpath variables must not be inherited by the standalone
* OpenJDK process used for the tooling API. Some OEM framework images contain
* stale entries here (for example Huawei/Honor UniPerf classes) that can make
* native ART registration abort the JVM before the server starts.
*/
private val ANDROID_RUNTIME_ENV_KEYS = setOf(
"BOOTCLASSPATH",
"DEX2OATBOOTCLASSPATH",
"SYSTEMSERVERCLASSPATH",
"STANDALONE_SYSTEMSERVER_JARS",
"CLASSPATH",
)
}

fun setListener(listener: OnServerStartListener?) {
Expand Down Expand Up @@ -123,15 +136,21 @@ internal class ToolingServerRunner(
Environment.TOOLING_API_JAR.absolutePath,
)

process =
executeProcessAsync {
this.command = command
val sanitizedEnv = envs.filterKeys { it !in ANDROID_RUNTIME_ENV_KEYS }

process =
ProcessBuilder(command).run {
// input and output is used for communication to the tooling server
// error stream is used to read the server logs
this.redirectErrorStream = false
this.workingDirectory = null // HOME
this.environment = envs
redirectErrorStream(false)
directory(Environment.HOME)

// Do not inherit the app process environment. Inheriting Android runtime
// classpath variables can crash the standalone OpenJDK process on some
// OEM images before our tooling server is initialized.
environment().clear()
environment().putAll(sanitizedEnv)
start()
}

pid =
Expand Down