Skip to content

Commit b43a572

Browse files
committed
fix(server): find Android Studio's JDK on macOS and skip the java stub
1 parent b176a4f commit b43a572

3 files changed

Lines changed: 60 additions & 25 deletions

File tree

‎apps/server/src/device/LocalDeviceHost.test.ts‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ describe("Android SDK availability", () => {
389389
`${root}/platform-tools/adb`,
390390
`${root}/emulator/emulator`,
391391
`${root}/cmdline-tools/latest/bin/avdmanager`,
392-
"/Applications/Android Studio.app/Contents/jbr/bin/java",
392+
"/Applications/Android Studio.app/Contents/jbr/Contents/Home/bin/java",
393393
],
394394
{ HOME: "/test/home" },
395395
);
@@ -426,7 +426,15 @@ describe("Android SDK availability", () => {
426426
Effect.provideService(HostProcess.Platform, platform),
427427
Effect.provideService(
428428
FileSystem.FileSystem,
429-
FileSystem.makeNoop({ exists: (file) => Effect.succeed(files.includes(file)) }),
429+
FileSystem.makeNoop({
430+
exists: (file) => Effect.succeed(files.includes(file)),
431+
readDirectory: (directory) =>
432+
Effect.succeed(
433+
files
434+
.filter((file) => file.startsWith(`${directory}/`))
435+
.map((file) => file.slice(directory.length + 1)),
436+
),
437+
}),
430438
),
431439
Effect.provide(platform === "win32" ? NodePath.layerWin32 : NodePath.layerPosix),
432440
);
@@ -443,6 +451,17 @@ describe("Android SDK availability", () => {
443451
),
444452
).toBe("D:\\Apps\\Android\\Android Studio\\jbr");
445453
expect(yield* javaHome([], { HOME: "/test/home" }, "linux")).toBeNull();
454+
const macStudio = "/Applications/Android Studio.app/Contents/jbr/Contents/Home";
455+
expect(yield* javaHome([`${macStudio}/bin/java`], { HOME: "/Users/test" }, "darwin")).toBe(
456+
macStudio,
457+
);
458+
expect(
459+
yield* javaHome(
460+
[`${macStudio}/bin/java`, "/Library/Java/JavaVirtualMachines/temurin-17.jdk"],
461+
{ HOME: "/Users/test" },
462+
"darwin",
463+
),
464+
).toBeUndefined();
446465
}),
447466
);
448467

@@ -470,25 +489,20 @@ it.effect("puts detected Android tools on the helper PATH without losing existin
470489
}).pipe(Effect.provide(NodePath.layerPosix)),
471490
);
472491

473-
it.effect("finds an Android SDK and JDK installed after the server started", () =>
492+
it.effect("finds an Android SDK installed after the server started", () =>
474493
Effect.gen(function* () {
475494
const runs: Array<ProcessRunner.ProcessRunInput> = [];
476495
const { host, fs, baseDir } = yield* agentFixture(() => Effect.succeed(processOutput(0)), runs);
477496
const sdk = `${baseDir}/Library/Android/sdk`;
478-
const jbr = `${baseDir}/Applications/Android Studio.app/Contents/jbr`;
479-
for (const file of [
480-
`${sdk}/platform-tools/adb`,
481-
`${sdk}/emulator/emulator`,
482-
`${jbr}/bin/java`,
483-
]) {
497+
for (const file of [`${sdk}/platform-tools/adb`, `${sdk}/emulator/emulator`]) {
484498
yield* fs.makeDirectory(file.slice(0, file.lastIndexOf("/")), { recursive: true });
485499
yield* fs.writeFileString(file, "");
486500
}
487501
const ready = yield* host.current;
488502
yield* ready!.run("emulator", ["-list-avds"]);
489503
expect(runs.at(-1)).toMatchObject({
490504
command: `${sdk}/emulator/emulator`,
491-
env: { ANDROID_HOME: sdk, JAVA_HOME: jbr },
505+
env: { ANDROID_HOME: sdk },
492506
});
493507
}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
494508
);

‎apps/server/src/device/LocalDeviceHost.ts‎

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
type NodeRuntimeUnavailableError,
1919
} from "@t3tools/shared/nodeRuntime";
2020
import * as NetService from "@t3tools/shared/Net";
21-
import { isCommandAvailable } from "@t3tools/shared/shell";
21+
import { isCommandAvailable, resolveCommandPath } from "@t3tools/shared/shell";
2222
import * as Clock from "effect/Clock";
2323
import * as Duration from "effect/Duration";
2424
import * as Effect from "effect/Effect";
@@ -135,7 +135,7 @@ const platformReason = Effect.fn("LocalDeviceHost.platformReason")(function* (
135135
* The hub lists AVDs with avdmanager, a Java program. GUI-launched servers
136136
* rarely inherit a JDK, so fall back to the one bundled with Android Studio.
137137
* Keep the candidates in step with `remoteDeviceEnvironment`.
138-
* `undefined` means `java` is already on PATH.
138+
* `undefined` means a working `java` is already on PATH.
139139
*/
140140
const androidJava = Effect.gen(function* () {
141141
const fs = yield* FileSystem.FileSystem;
@@ -144,26 +144,45 @@ const androidJava = Effect.gen(function* () {
144144
const platform = yield* HostProcess.Platform;
145145
const javaHome = environment.JAVA_HOME?.trim();
146146
if (javaHome) return javaHome;
147-
if (yield* isCommandAvailable("java")) return undefined;
148147
const home = environment.HOME ?? environment.USERPROFILE ?? "";
148+
const java = yield* resolveCommandPath("java");
149+
if (platform === "darwin") {
150+
// /usr/bin/java is a launcher stub that fails unless a JDK is registered here.
151+
for (const directory of [
152+
"/Library/Java/JavaVirtualMachines",
153+
path.join(home, "Library", "Java", "JavaVirtualMachines"),
154+
]) {
155+
const installed = yield* fs.readDirectory(directory).pipe(Effect.orElseSucceed(() => []));
156+
if (installed.length > 0) return undefined;
157+
}
158+
if (java && java !== "/usr/bin/java") return undefined;
159+
} else if (java) {
160+
return undefined;
161+
}
149162
const candidates =
150163
platform === "win32"
151-
? [path.join(environment.ProgramFiles ?? "C:\\Program Files", "Android", "Android Studio")]
164+
? [
165+
path.join(
166+
environment.ProgramFiles ?? "C:\\Program Files",
167+
"Android",
168+
"Android Studio",
169+
"jbr",
170+
),
171+
]
152172
: platform === "darwin"
153173
? [
154-
"/Applications/Android Studio.app/Contents",
155-
path.join(home, "Applications", "Android Studio.app", "Contents"),
174+
"/Applications/Android Studio.app/Contents/jbr/Contents/Home",
175+
path.join(home, "Applications/Android Studio.app/Contents/jbr/Contents/Home"),
156176
]
157177
: [
158-
path.join(home, ".local", "opt", "android-studio"),
159-
"/opt/android-studio",
160-
"/usr/local/android-studio",
161-
"/snap/android-studio/current",
178+
path.join(home, ".local", "opt", "android-studio", "jbr"),
179+
"/opt/android-studio/jbr",
180+
"/usr/local/android-studio/jbr",
181+
"/snap/android-studio/current/jbr",
162182
];
163183
for (const candidate of candidates) {
164-
const jbr = path.join(candidate, "jbr");
165-
const java = path.join(jbr, "bin", platform === "win32" ? "java.exe" : "java");
166-
if (yield* fs.exists(java).pipe(Effect.orElseSucceed(() => false))) return jbr;
184+
const executable = path.join(candidate, "bin", platform === "win32" ? "java.exe" : "java");
185+
if (yield* fs.exists(executable).pipe(Effect.orElseSucceed(() => false))) return candidate;
167186
}
168187
return null;
169188
});

‎apps/server/src/device/sshDeviceScript.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ if [ -z "$ANDROID_HOME" ]; then
99
elif [ -d "$HOME/Android/Sdk" ]; then export ANDROID_HOME="$HOME/Android/Sdk"; fi
1010
fi
1111
if [ -n "$ANDROID_HOME" ]; then export PATH="$ANDROID_HOME/platform-tools:$ANDROID_HOME/emulator:$PATH"; fi
12-
if [ -z "$JAVA_HOME" ] && ! command -v java >/dev/null 2>&1; then
13-
for device_java_home in "$HOME/.local/opt/android-studio/jbr" /opt/android-studio/jbr /usr/local/android-studio/jbr /snap/android-studio/current/jbr /Applications/Android\\ Studio.app/Contents/jbr "$HOME/Applications/Android Studio.app/Contents/jbr"; do
12+
device_java_path="$(command -v java 2>/dev/null)"
13+
if [ "$device_java_path" = /usr/bin/java ] && [ "$(uname)" = Darwin ] && ! /usr/libexec/java_home >/dev/null 2>&1; then device_java_path=; fi
14+
if [ -z "$JAVA_HOME" ] && [ -z "$device_java_path" ]; then
15+
for device_java_home in "$HOME/.local/opt/android-studio/jbr" /opt/android-studio/jbr /usr/local/android-studio/jbr /snap/android-studio/current/jbr /Applications/Android\\ Studio.app/Contents/jbr/Contents/Home "$HOME/Applications/Android Studio.app/Contents/jbr/Contents/Home"; do
1416
if [ -x "$device_java_home/bin/java" ]; then export JAVA_HOME="$device_java_home"; break; fi
1517
done
1618
fi

0 commit comments

Comments
 (0)