From c2b74aa83eaa46e5aeddbd2e87b8eac29a3ac679 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sat, 16 Apr 2022 07:21:02 -0700
Subject: [PATCH] Update avd_test.sh

---
 scripts/avd_test.sh | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/scripts/avd_test.sh b/scripts/avd_test.sh
index 59f884da9..6f6452b01 100755
--- a/scripts/avd_test.sh
+++ b/scripts/avd_test.sh
@@ -11,8 +11,8 @@ cleanup() {
 trap cleanup EXIT
 
 emu="$ANDROID_SDK_ROOT/emulator/emulator"
-avd="$ANDROID_SDK_ROOT"/cmdline-tools/latest/bin/avdmanager
-sdk="$ANDROID_SDK_ROOT"/cmdline-tools/latest/bin/sdkmanager
+avd="$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/avdmanager"
+sdk="$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager"
 type='google_apis'
 emu_args='-no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim'
 
@@ -28,7 +28,7 @@ wait_for_boot() {
 export -f wait_for_boot
 
 test_api() {
-  local pkg pid ramdisk
+  local pkg pid img_dir ramdisk features
 
   # Setup emulator
   pkg="system-images;android-$1;$type;x86_64"
@@ -39,19 +39,24 @@ test_api() {
   echo no | "$avd" create avd -f -n test -k $pkg
 
   # Launch emulator and patch
-  ramdisk="$ANDROID_SDK_ROOT/system-images/android-$1/$type/x86_64/ramdisk.img"
+  img_dir="$ANDROID_SDK_ROOT/system-images/android-$1/$type/x86_64"
+  ramdisk="$img_dir/ramdisk.img"
+  features="$img_dir/advancedFeatures.ini"
   if [ -f "${ramdisk}.bak" ]; then
     cp "${ramdisk}.bak" "$ramdisk"
   fi
-  $emu @test $emu_args &
+  if [ -f "${features}.bak" ]; then
+    cp "${features}.bak" "$features"
+  fi
+  "$emu" @test $emu_args &
   pid=$!
   timeout 60 adb wait-for-device
-  ./build.py avd_patch -s $ramdisk
+  ./build.py avd_patch -s "$ramdisk"
   kill -INT $pid
   wait $pid
 
   # Test if it boots properly
-  $emu @test $emu_args &
+  "$emu" @test $emu_args &
   pid=$!
   timeout 60 adb wait-for-device
   timeout 60 bash -c wait_for_boot
@@ -75,4 +80,6 @@ for api in 23 26 28 32; do
   test_api $api
 done
 
+"$avd" delete avd -n test
+
 trap - EXIT