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

Malinskiy · Jan 22, 2024 · a90e8d1 · a90e8d1
1 parent 5b22b8c
commit a90e8d1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
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> {