Merge branch 'main' into release/v2

* main: Prepare for release 2.14.1. Fix AVD creation hang when profile is not specified.
ReactiveCircus · Dec 28, 2020 · 70e3f6e · 70e3f6e
2 parents 02cf805 + 0d8602f
commit 70e3f6e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## v2.14.1
+
+* Fix hang during AVD creation when `profile` is not specified - [#113](https://github.com/ReactiveCircus/android-emulator-runner/issues/113).
+
 ## v2.14.0
 
 * Support specifying SD card path or size via `sdcard-path-or-size`.

diff --git a/lib/emulator-manager.js b/lib/emulator-manager.js
@@ -37,10 +37,10 @@ const EMULATOR_BOOT_TIMEOUT_SECONDS = 600;
 function launchEmulator(apiLevel, target, arch, profile, sdcardPathOrSize, avdName, emulatorOptions, disableAnimations) {
     return __awaiter(this, void 0, void 0, function* () {
         // create a new AVD
-        const profileOption = profile.trim() !== '' ? `--device "${profile}"` : '';
-        const sdcardPathOrSizeOption = sdcardPathOrSize.trim() !== '' ? `--sdcard "${sdcardPathOrSize}"` : '';
+        const profileOption = profile.trim() !== '' ? `--device '${profile}'` : '';
+        const sdcardPathOrSizeOption = sdcardPathOrSize.trim() !== '' ? `--sdcard '${sdcardPathOrSize}'` : '';
         console.log(`Creating AVD.`);
-        yield exec.exec(`avdmanager create avd --force -n "${avdName}" --abi "${target}/${arch}" --package "system-images;android-${apiLevel};${target};${arch}" ${profileOption} ${sdcardPathOrSizeOption}`);
+        yield exec.exec(`sh -c \\"echo no | avdmanager create avd --force -n "${avdName}" --abi '${target}/${arch}' --package 'system-images;android-${apiLevel};${target};${arch}' ${profileOption} ${sdcardPathOrSizeOption}"`);
         // start emulator
         console.log('Starting emulator.');
         // turn off hardware acceleration on Linux

diff --git a/src/emulator-manager.ts b/src/emulator-manager.ts
@@ -16,10 +16,12 @@ export async function launchEmulator(
   disableAnimations: boolean
 ): Promise<void> {
   // create a new AVD
-  const profileOption = profile.trim() !== '' ? `--device "${profile}"` : '';
-  const sdcardPathOrSizeOption = sdcardPathOrSize.trim() !== '' ? `--sdcard "${sdcardPathOrSize}"` : '';
+  const profileOption = profile.trim() !== '' ? `--device '${profile}'` : '';
+  const sdcardPathOrSizeOption = sdcardPathOrSize.trim() !== '' ? `--sdcard '${sdcardPathOrSize}'` : '';
   console.log(`Creating AVD.`);
-  await exec.exec(`avdmanager create avd --force -n "${avdName}" --abi "${target}/${arch}" --package "system-images;android-${apiLevel};${target};${arch}" ${profileOption} ${sdcardPathOrSizeOption}`);
+  await exec.exec(
+    `sh -c \\"echo no | avdmanager create avd --force -n "${avdName}" --abi '${target}/${arch}' --package 'system-images;android-${apiLevel};${target};${arch}' ${profileOption} ${sdcardPathOrSizeOption}"`
+  );
 
   // start emulator
   console.log('Starting emulator.');