diff --git a/emulator-run-cmd/src/sdk.ts b/emulator-run-cmd/src/sdk.ts index f6b40d50..81448689 100644 --- 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 { diff --git a/install-sdk/src/sdk.ts b/install-sdk/src/sdk.ts index 1d83b657..6955096e 100644 --- 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 {