Create emulator with ability to overwrite

This is necessary on a custom runner, when previous job failed
Malinskiy · Apr 27, 2023 · 365b221 · 365b221
1 parent 7657cd1
commit 365b221
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/emulator-run-cmd/lib/sdk.js b/emulator-run-cmd/lib/sdk.js
@@ -119,7 +119,7 @@ class BaseAndroidSdk {
             if (hardwareProfile != null && hardwareProfile != "") {
                 additionalOptions += `--device ${hardwareProfile}`;
             }
-            yield (0, exec_with_result_1.execIgnoreFailure)(`bash -c \\\"echo -n no | ${this.androidHome()}/cmdline-tools/bootstrap-version/bin/avdmanager create avd -n ${name} --package \\\"system-images;android-${api};${tag};${abi}\\\" --tag ${tag}\" ${additionalOptions}`);
+            yield (0, exec_with_result_1.execIgnoreFailure)(`bash -c \\\"echo -n no | ${this.androidHome()}/cmdline-tools/bootstrap-version/bin/avdmanager create avd -n ${name} --force --package \\\"system-images;android-${api};${tag};${abi}\\\" --tag ${tag}\" ${additionalOptions}`);
             return new emulator_1.Emulator(this, name, api, abi, tag, this.portCounter++, this.portCounter++);
         });
     }

diff --git a/emulator-run-cmd/src/sdk.ts b/emulator-run-cmd/src/sdk.ts
@@ -123,7 +123,7 @@ export abstract class BaseAndroidSdk implements AndroidSDK {
             additionalOptions += `--device ${hardwareProfile}`
         }
 
-        await execIgnoreFailure(`bash -c \\\"echo -n no | ${this.androidHome()}/cmdline-tools/bootstrap-version/bin/avdmanager create avd -n ${name} --package \\\"system-images;android-${api};${tag};${abi}\\\" --tag ${tag}\" ${additionalOptions}`)
+        await execIgnoreFailure(`bash -c \\\"echo -n no | ${this.androidHome()}/cmdline-tools/bootstrap-version/bin/avdmanager create avd -n ${name} --force --package \\\"system-images;android-${api};${tag};${abi}\\\" --tag ${tag}\" ${additionalOptions}`)
         return new Emulator(this, name, api, abi, tag, this.portCounter++, this.portCounter++)
     }
 

diff --git a/install-sdk/lib/sdk.js b/install-sdk/lib/sdk.js
@@ -120,7 +120,7 @@ class BaseAndroidSdk {
             if (hardwareProfile != null && hardwareProfile != "") {
                 additionalOptions += `--device ${hardwareProfile}`;
             }
-            yield (0, exec_with_result_1.execIgnoreFailure)(`bash -c \\\"echo -n no | ${this.androidHome()}/cmdline-tools/bootstrap-version/bin/avdmanager create avd -n ${name} --package \\\"system-images;android-${api};${tag};${abi}\\\" --tag ${tag}\" ${additionalOptions}`);
+            yield (0, exec_with_result_1.execIgnoreFailure)(`bash -c \\\"echo -n no | ${this.androidHome()}/cmdline-tools/bootstrap-version/bin/avdmanager create avd -n ${name} --force --package \\\"system-images;android-${api};${tag};${abi}\\\" --tag ${tag}\" ${additionalOptions}`);
             return new emulator_1.Emulator(this, name, api, abi, tag, this.portCounter++, this.portCounter++);
         });
     }

diff --git a/install-sdk/src/sdk.ts b/install-sdk/src/sdk.ts
@@ -124,7 +124,7 @@ export abstract class BaseAndroidSdk implements AndroidSDK {
             additionalOptions += `--device ${hardwareProfile}`
         }
 
-        await execIgnoreFailure(`bash -c \\\"echo -n no | ${this.androidHome()}/cmdline-tools/bootstrap-version/bin/avdmanager create avd -n ${name} --package \\\"system-images;android-${api};${tag};${abi}\\\" --tag ${tag}\" ${additionalOptions}`)
+        await execIgnoreFailure(`bash -c \\\"echo -n no | ${this.androidHome()}/cmdline-tools/bootstrap-version/bin/avdmanager create avd -n ${name} --force --package \\\"system-images;android-${api};${tag};${abi}\\\" --tag ${tag}\" ${additionalOptions}`)
         return new Emulator(this, name, api, abi, tag, this.portCounter++, this.portCounter++)
     }