From 21c8ad5b9e2de3a8a4c9ef5dd83410c2f16e5067 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Thu, 20 Jan 2022 01:33:59 -0800
Subject: [PATCH] Fix up some AVD scripts

---
 scripts/avd_magisk.sh | 5 +++--
 scripts/avd_patch.sh  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/avd_magisk.sh b/scripts/avd_magisk.sh
index a8b388ea7..1776199a6 100755
--- a/scripts/avd_magisk.sh
+++ b/scripts/avd_magisk.sh
@@ -54,7 +54,7 @@ unzip -oj app-debug.apk 'assets/util_functions.sh'
 
 api_level_arch_detect
 
-unzip -oj app-debug.apk "lib/$ABI/*" "lib/$ABI32/libmagisk32.so" -x "lib/$ABI/busybox.so"
+unzip -oj app-debug.apk "lib/$ABI/*" "lib/$ABI32/libmagisk32.so" -x "lib/$ABI/libbusybox.so"
 for file in lib*.so; do
   chmod 755 $file
   mv "$file" "${file:3:${#file}-6}"
@@ -119,7 +119,8 @@ fi
 
 # Magisk stuff
 mkdir -p $MAGISKBIN 2>/dev/null
-unzip -oj app-debug.apk 'assets/*' -x 'assets/chromeos/*' -d $MAGISKBIN
+unzip -oj app-debug.apk 'assets/*' -x 'assets/chromeos/*' \
+-x 'assets/bootctl' -x 'assets/main.jar' -d $MAGISKBIN
 mkdir $NVBASE/modules 2>/dev/null
 mkdir $POSTFSDATAD 2>/dev/null
 mkdir $SERVICED 2>/dev/null
diff --git a/scripts/avd_patch.sh b/scripts/avd_patch.sh
index dcb00a973..9856ae9fa 100644
--- a/scripts/avd_patch.sh
+++ b/scripts/avd_patch.sh
@@ -51,7 +51,7 @@ unzip -oj app-debug.apk 'assets/util_functions.sh'
 
 api_level_arch_detect
 
-unzip -oj app-debug.apk "lib/$ABI/*" "lib/$ABI32/libmagisk32.so" -x "lib/$ABI/busybox.so"
+unzip -oj app-debug.apk "lib/$ABI/*" "lib/$ABI32/libmagisk32.so" -x "lib/$ABI/libbusybox.so"
 for file in lib*.so; do
   chmod 755 $file
   mv "$file" "${file:3:${#file}-6}"