From ce6540a6f3bacad3181ff55f1885d56951b5d20b Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 19 Sep 2023 16:06:56 +0530 Subject: [PATCH] fix(scripts): allow running on Darwin hosts --- scripts/boot-emulator.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/boot-emulator.sh b/scripts/boot-emulator.sh index cbb568ce..94b98302 100755 --- a/scripts/boot-emulator.sh +++ b/scripts/boot-emulator.sh @@ -11,15 +11,20 @@ set -euo pipefail } [ -n "${ANDROID_API_LEVEL:-}" ] || { echo "ANDROID_API_LEVEL not defined; defaulting to 33"; } +ARCH="x86_64" +if [[ "$(uname -m)" == "arm64" && "$(uname)" == "Darwin" ]]; then + ARCH="arm64-v8a" +fi + API_LEVEL="${ANDROID_API_LEVEL:-33}" -sdkmanager "system-images;android-${API_LEVEL};google_apis;x86_64" +sdkmanager "system-images;android-${API_LEVEL};google_apis;${ARCH}" echo no | "${ANDROID_HOME}"/cmdline-tools/latest/bin/avdmanager create avd \ --force \ -n "Pixel_XL_API_${API_LEVEL}" \ - --abi 'google_apis/x86_64' \ - --package "system-images;android-${API_LEVEL};google_apis;x86_64" \ + --abi "google_apis/${ARCH}" \ + --package "system-images;android-${API_LEVEL};google_apis;${ARCH}" \ --device 'pixel_xl' "${ANDROID_HOME}"/emulator/emulator \