Update avd_test.sh

scripts/avd_test.sh

@@ -1,32 +1,36 @@
 #!/usr/bin/env bash
 
-set -xe
-
-cleanup() {
-  echo -e '\n\033[41m! An error occurred\033[0m\n'
-  pkill -INT -P $$
-  wait
-}
-
-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"
 emu_args='-no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim'
 
-case $(uname -m) in
-  'arm64'|'aarch64')
-    arch=arm64-v8a
-    ;;
-  *)
-    arch=x86_64
-    ;;
-esac
-
 # Should be either 'google_apis' or 'default'
 type='google_apis'
 
+# We test these API levels for the following reason
+
+# API 23: legacy rootfs w/o Treble
+# API 26: legacy rootfs with Treble
+# API 28: legacy system-as-root
+# API 29: 2 Stage Init
+# API 33: latest Android
+
+api_list='23 26 28 29 33'
+
+cleanup() {
+  echo -e '\n\033[41m! An error occurred\033[0m\n'
+  pkill -INT -P $$
+  wait
+
+  for api in $api_list; do
+    set_api_env $api
+    restore_avd
+  done
+
+  "$avd" delete avd -n test
+}
+
 wait_for_boot() {
   while true; do
     if [ -n "$(adb shell getprop sys.boot_completed)" ]; then
@@ -36,29 +40,32 @@ wait_for_boot() {
   done
 }
 
-export -f wait_for_boot
+set_api_env() {
-
-test_api() {
-  local pkg pid img_dir ramdisk features
-
-  # Setup emulator
   pkg="system-images;android-$1;$type;$arch"
-
+  local img_dir="$ANDROID_SDK_ROOT/system-images/android-$1/$type/$arch"
-  echo -e "\n\033[44m* Testing $pkg\033[0m\n"
-
-  "$sdk" $pkg
-  echo no | "$avd" create avd -f -n test -k $pkg
-
-  # Launch emulator and patch
-  img_dir="$ANDROID_SDK_ROOT/system-images/android-$1/$type/$arch"
   ramdisk="$img_dir/ramdisk.img"
   features="$img_dir/advancedFeatures.ini"
+}
+
+restore_avd() {
   if [ -f "${ramdisk}.bak" ]; then
     cp "${ramdisk}.bak" "$ramdisk"
   fi
   if [ -f "${features}.bak" ]; then
     cp "${features}.bak" "$features"
   fi
+}
+
+run_test() {
+  local pid
+
+  # Setup emulator
+  echo -e "\n\033[44m* Testing $pkg\033[0m\n"
+  "$sdk" $pkg
+  echo no | "$avd" create avd -f -n test -k $pkg
+
+  # Launch emulator and patch
+  restore_avd
   "$emu" @test $emu_args &
   pid=$!
   timeout 60 adb wait-for-device
@@ -76,29 +83,35 @@ test_api() {
   kill -INT $pid
   wait $pid
 
-  # Restore patches
+  restore_avd
-  if [ -f "${ramdisk}.bak" ]; then
-    cp "${ramdisk}.bak" "$ramdisk"
-  fi
-  if [ -f "${features}.bak" ]; then
-    cp "${features}.bak" "$features"
-  fi
 }
 
+trap cleanup EXIT
+
+export -f wait_for_boot
+
+set -xe
+
+if grep -q 'ENABLE_AVD_HACK 0' native/src/init/init.hpp; then
+  echo -e '\n\033[41m! Please patch init.hpp\033[0m\n'
+  exit 1
+fi
+
+case $(uname -m) in
+  'arm64'|'aarch64')
+    arch=arm64-v8a
+    ;;
+  *)
+    arch=x86_64
+    ;;
+esac
+
 # Build our executables
-./build.py binary
+./build.py all
-./build.py app
 
-# We test these API levels for the following reason
+for api in $api_list; do
-
+  set_api_env $api
-# API 23: legacy rootfs w/o Treble
+  run_test
-# API 26: legacy rootfs with Treble
-# API 28: legacy system-as-root
-# API 29: 2 Stage Init
-# API 33: latest Android
-
-for api in 23 26 28 29 33; do
-  test_api $api
 done
 
 "$avd" delete avd -n test