Skip to content

Commit a8f6bc2

Browse files
committed
fix(server): detect unsupported legacy Android command-line tools
1 parent 3060cc4 commit a8f6bc2

2 files changed

Lines changed: 64 additions & 7 deletions

File tree

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

Lines changed: 53 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,21 @@ import * as NetService from "@t3tools/shared/Net";
1414
import * as ServerConfig from "../config.ts";
1515
import * as ProcessRunner from "../processRunner.ts";
1616

17-
const diagnose = (files: ReadonlyArray<string>, environment: NodeJS.ProcessEnv) =>
17+
const diagnose = (
18+
files: ReadonlyArray<string>,
19+
environment: NodeJS.ProcessEnv,
20+
platform: NodeJS.Platform = "darwin",
21+
) =>
1822
LocalDeviceHost.__testing.platformReason("android").pipe(
1923
Effect.provideService(HostProcessEnvironment, environment),
20-
Effect.provideService(HostProcessPlatform, "darwin"),
24+
Effect.provideService(HostProcessPlatform, platform),
2125
Effect.provideService(
2226
FileSystem.FileSystem,
2327
FileSystem.makeNoop({
2428
exists: (file) => Effect.succeed(files.includes(file)),
2529
}),
2630
),
27-
Effect.provide(NodePath.layer),
31+
Effect.provide(platform === "win32" ? NodePath.layerWin32 : NodePath.layerPosix),
2832
);
2933

3034
describe("Android SDK availability", () => {
@@ -40,7 +44,52 @@ describe("Android SDK availability", () => {
4044
const reason = yield* diagnose(["/sdk/platform-tools/adb", "/sdk/emulator/emulator"], {
4145
ANDROID_HOME: "/sdk",
4246
});
43-
expect(reason).toContain("Command-line Tools (latest)");
47+
expect(reason).toContain("Command-line Tools (latest) are missing");
48+
}),
49+
);
50+
51+
it.effect("explains how to upgrade legacy command-line tools in the standard macOS SDK", () =>
52+
Effect.gen(function* () {
53+
const root = "/test/home/Library/Android/sdk";
54+
const reason = yield* diagnose(
55+
[`${root}/platform-tools/adb`, `${root}/emulator/emulator`, `${root}/tools/bin/avdmanager`],
56+
{ HOME: "/test/home" },
57+
);
58+
expect(reason).toContain("older, unsupported version");
59+
expect(reason).toContain(root);
60+
expect(reason).toContain(
61+
"Install Android SDK Command-line Tools (latest) in Android Studio's SDK Manager under SDK Tools.",
62+
);
63+
}),
64+
);
65+
66+
it.effect("recognizes legacy command-line tools on Windows", () =>
67+
Effect.gen(function* () {
68+
const reason = yield* diagnose(
69+
[
70+
"C:\\Android\\Sdk\\platform-tools\\adb.exe",
71+
"C:\\Android\\Sdk\\emulator\\emulator.exe",
72+
"C:\\Android\\Sdk\\tools\\bin\\avdmanager.bat",
73+
],
74+
{ ANDROID_HOME: "C:\\Android\\Sdk" },
75+
"win32",
76+
);
77+
expect(reason).toContain("older, unsupported version");
78+
}),
79+
);
80+
81+
it.effect("accepts the latest command-line tools when legacy tools are also installed", () =>
82+
Effect.gen(function* () {
83+
const reason = yield* diagnose(
84+
[
85+
"/sdk/platform-tools/adb",
86+
"/sdk/emulator/emulator",
87+
"/sdk/tools/bin/avdmanager",
88+
"/sdk/cmdline-tools/latest/bin/avdmanager",
89+
],
90+
{ ANDROID_HOME: "/sdk" },
91+
);
92+
expect(reason).toBeNull();
4493
}),
4594
);
4695

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,11 @@ const platformReason = Effect.fn("LocalDeviceHost.platformReason")(function* (
104104
return `Android SDK Platform-Tools are missing from ${sdk.root}. Install them in Android Studio's SDK Manager.`;
105105
if (!sdk.emulator)
106106
return `Android Emulator is missing from ${sdk.root}. Install it in Android Studio's SDK Manager.`;
107-
if (!sdk.avdmanager)
107+
if (!sdk.avdmanager) {
108+
if (sdk.legacyAvdmanager)
109+
return `The Android SDK command-line tools in ${sdk.root} appear to be an older, unsupported version. Install Android SDK Command-line Tools (latest) in Android Studio's SDK Manager under SDK Tools.`;
108110
return `Android SDK Command-line Tools (latest) are missing from ${sdk.root}. Install them in Android Studio's SDK Manager.`;
111+
}
109112
return null;
110113
});
111114

@@ -155,10 +158,15 @@ const androidSdk = Effect.gen(function* () {
155158
platform === "win32" ? "avdmanager.bat" : "avdmanager",
156159
),
157160
);
158-
return { root, adb, emulator, avdmanager };
161+
const legacyAvdmanager =
162+
!avdmanager &&
163+
(yield* exists(
164+
path.join(root, "tools", "bin", platform === "win32" ? "avdmanager.bat" : "avdmanager"),
165+
));
166+
return { root, adb, emulator, avdmanager, legacyAvdmanager };
159167
}
160168
}
161-
return { root: null, adb: false, emulator: false, avdmanager: false };
169+
return { root: null, adb: false, emulator: false, avdmanager: false, legacyAvdmanager: false };
162170
});
163171

164172
const deviceHostEnvironment = (

0 commit comments

Comments
 (0)