update cmdline-tools path.

ychescale9 · ychescale9 · commit 7ff545cc8917 · 2024-10-11T11:02:55.000+11:00
diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js
@@ -61,7 +61,7 @@ function installAndroidSdk(apiLevel, target, arch, channelId, emulatorBuild, ndk
                 yield io.mv(`${cmdlineToolsPath}/cmdline-tools`, `${cmdlineToolsPath}/latest`);
             }
             // add paths for commandline-tools and platform-tools
-            core.addPath(`${cmdlineToolsPath}/latest:${cmdlineToolsPath}/latest/bin:${process.env.ANDROID_HOME}/platform-tools`);
+            core.addPath(`${cmdlineToolsPath}/12.0:${cmdlineToolsPath}/12.0/bin:${process.env.ANDROID_HOME}/platform-tools`);
             // set standard AVD path
             core.exportVariable('ANDROID_AVD_HOME', `${process.env.HOME}/.android/avd`);
             // accept all Android SDK licenses
diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts
@@ -29,7 +29,7 @@ export async function installAndroidSdk(apiLevel: string, target: string, arch:
     }
 
     // add paths for commandline-tools and platform-tools
-    core.addPath(`${cmdlineToolsPath}/latest:${cmdlineToolsPath}/latest/bin:${process.env.ANDROID_HOME}/platform-tools`);
+    core.addPath(`${cmdlineToolsPath}/12.0:${cmdlineToolsPath}/12.0/bin:${process.env.ANDROID_HOME}/platform-tools`);
 
     // set standard AVD path
     core.exportVariable('ANDROID_AVD_HOME', `${process.env.HOME}/.android/avd`);

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ function installAndroidSdk(apiLevel, target, arch, channelId, emulatorBuild, ndk`
`61`	`61`	yield io.mv(`${cmdlineToolsPath}/cmdline-tools`, `${cmdlineToolsPath}/latest`);
`62`	`62`	`}`
`63`	`63`	`// add paths for commandline-tools and platform-tools`
`64`		- core.addPath(`${cmdlineToolsPath}/latest:${cmdlineToolsPath}/latest/bin:${process.env.ANDROID_HOME}/platform-tools`);
	`64`	+ core.addPath(`${cmdlineToolsPath}/12.0:${cmdlineToolsPath}/12.0/bin:${process.env.ANDROID_HOME}/platform-tools`);
`65`	`65`	`// set standard AVD path`
`66`	`66`	core.exportVariable('ANDROID_AVD_HOME', `${process.env.HOME}/.android/avd`);
`67`	`67`	`// accept all Android SDK licenses`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export async function installAndroidSdk(apiLevel: string, target: string, arch:`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// add paths for commandline-tools and platform-tools`
`32`		- core.addPath(`${cmdlineToolsPath}/latest:${cmdlineToolsPath}/latest/bin:${process.env.ANDROID_HOME}/platform-tools`);
	`32`	+ core.addPath(`${cmdlineToolsPath}/12.0:${cmdlineToolsPath}/12.0/bin:${process.env.ANDROID_HOME}/platform-tools`);
`33`	`33`
`34`	`34`	`// set standard AVD path`
`35`	`35`	core.exportVariable('ANDROID_AVD_HOME', `${process.env.HOME}/.android/avd`);