From 1502084709f6871905d09a323641f13c4efcc6b3 Mon Sep 17 00:00:00 2001
From: Victor Gaydov <victor@enise.org>
Date: Thu, 24 Jun 2021 22:44:52 +0300
Subject: [PATCH] Downgrade and freeze emulator version

---
 .github/workflows/build.yml       | 6 ++++++
 scripts/ci/android/macos_build.sh | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 72e99f269..517ac3a10 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -221,6 +221,12 @@ jobs:
             system-images;android-${{ matrix.api }};${{ matrix.avd_tgt }};${{ matrix.avd_abi }}
             emulator
 
+      - name: Install Android emulator
+        run: |
+          wget -O emulator.zip \
+            https://dl.google.com/android/repository/emulator-darwin_x64-7140946.zip
+          unzip emulator.zip
+
       - name: Install system dependencies
         run: |
           scripts/ci/android/macos_deps.sh
diff --git a/scripts/ci/android/macos_build.sh b/scripts/ci/android/macos_build.sh
index 2e639c8fd..2be97eaec 100755
--- a/scripts/ci/android/macos_build.sh
+++ b/scripts/ci/android/macos_build.sh
@@ -43,7 +43,7 @@ scons -Q \
 
 echo no | avdmanager create avd --name roc --package "$CI_AVD"
 
-( cd "$ANDROID_HOME/tools" &&
+( cd "emulator" &&
       ./emulator -avd roc -no-audio -no-boot-anim -no-window -gpu off -accel on & )
 
 boot_completed="0"