feat(sdk): sdk installation should add latest cmdline-tools

Malinskiy · Malinskiy · commit a90e8d10e697 · 2024-01-22T14:47:30.000+10:00
diff --git a/emulator-run-cmd/src/sdk.ts b/emulator-run-cmd/src/sdk.ts
@@ -105,7 +105,7 @@ export abstract class BaseAndroidSdk implements AndroidSDK {
             args += " > /dev/null"
         }
 
-        await execIgnoreFailure(`bash -c \\\"${this.androidHome()}/cmdline-tools/latest/bin/sdkmanager emulator 'cmdline-tools;latest' platform-tools 'system-images;android-${api};${tag};${abi}'${args}"`);
+        await execIgnoreFailure(`bash -c \\\"${this.androidHome()}/cmdline-tools/latest/bin/sdkmanager emulator platform-tools 'system-images;android-${api};${tag};${abi}'${args}"`);
     }
 
     async installPlatform(api: string, verbose: boolean): Promise<any> {
diff --git a/install-sdk/src/sdk.ts b/install-sdk/src/sdk.ts
@@ -75,6 +75,14 @@ export abstract class BaseAndroidSdk implements AndroidSDK {
         }).join(':')
 
         core.exportVariable('PATH', `${extraPaths}:${PATH_WITHOUT_ANDROID}`)
+
+        let args = ""
+        if (!verbose) {
+            args += " > /dev/null"
+        }
+
+        await execIgnoreFailure(`bash -c \\\"${this.androidHome()}/cmdline-tools/bootstrap-version/bin/sdkmanager 'cmdline-tools;latest'`)
+
         return true
     }
 
@@ -106,7 +114,7 @@ export abstract class BaseAndroidSdk implements AndroidSDK {
             args += " > /dev/null"
         }
 
-        await execIgnoreFailure(`bash -c \\\"${this.androidHome()}/cmdline-tools/bootstrap-version/bin/sdkmanager emulator 'cmdline-tools;latest' platform-tools 'system-images;android-${api};${tag};${abi}'${args}"`);
+        await execIgnoreFailure(`bash -c \\\"${this.androidHome()}/cmdline-tools/bootstrap-version/bin/sdkmanager emulator platform-tools 'system-images;android-${api};${tag};${abi}'${args}"`);
     }
 
     async installPlatform(api: string, verbose: boolean): Promise<any> {

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ export abstract class BaseAndroidSdk implements AndroidSDK {`
`105`	`105`	`args += " > /dev/null"`
`106`	`106`	`}`
`107`	`107`
`108`		- await execIgnoreFailure(`bash -c \\\"${this.androidHome()}/cmdline-tools/latest/bin/sdkmanager emulator 'cmdline-tools;latest' platform-tools 'system-images;android-${api};${tag};${abi}'${args}"`);
	`108`	+ await execIgnoreFailure(`bash -c \\\"${this.androidHome()}/cmdline-tools/latest/bin/sdkmanager emulator platform-tools 'system-images;android-${api};${tag};${abi}'${args}"`);
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`async installPlatform(api: string, verbose: boolean): Promise<any> {`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,14 @@ export abstract class BaseAndroidSdk implements AndroidSDK {`
`75`	`75`	`}).join(':')`
`76`	`76`
`77`	`77`	core.exportVariable('PATH', `${extraPaths}:${PATH_WITHOUT_ANDROID}`)
	`78`	`+`
	`79`	`+ let args = ""`
	`80`	`+ if (!verbose) {`
	`81`	`+ args += " > /dev/null"`
	`82`	`+ }`
	`83`	`+`
	`84`	+ await execIgnoreFailure(`bash -c \\\"${this.androidHome()}/cmdline-tools/bootstrap-version/bin/sdkmanager 'cmdline-tools;latest'`)
	`85`	`+`
`78`	`86`	`return true`
`79`	`87`	`}`
`80`	`88`
`@@ -106,7 +114,7 @@ export abstract class BaseAndroidSdk implements AndroidSDK {`
`106`	`114`	`args += " > /dev/null"`
`107`	`115`	`}`
`108`	`116`
`109`		- await execIgnoreFailure(`bash -c \\\"${this.androidHome()}/cmdline-tools/bootstrap-version/bin/sdkmanager emulator 'cmdline-tools;latest' platform-tools 'system-images;android-${api};${tag};${abi}'${args}"`);
	`117`	+ await execIgnoreFailure(`bash -c \\\"${this.androidHome()}/cmdline-tools/bootstrap-version/bin/sdkmanager emulator platform-tools 'system-images;android-${api};${tag};${abi}'${args}"`);
`110`	`118`	`}`
`111`	`119`
`112`	`120`	`async installPlatform(api: string, verbose: boolean): Promise<any> {`