From 7d501a7156ee4abe85a6493e6cff806552f7249c Mon Sep 17 00:00:00 2001
From: Howard Wu <40033067+Howard20181@users.noreply.github.com>
Date: Wed, 7 Feb 2024 02:37:33 +0800
Subject: [PATCH] Add back magisk32 to fix zygisk32
---
scripts/build.sh | 3 ++-
scripts/extractMagisk.py | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/build.sh b/scripts/build.sh
index e46b7ff..4f2db01 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -453,10 +453,11 @@ fi
if [ "$ROOT_SOL" = 'magisk' ]; then
echo "Integrate Magisk"
"$WORK_DIR/magisk/magiskboot" compress=xz "$WORK_DIR/magisk/magisk64" "$WORK_DIR/magisk/magisk64.xz"
+ "$WORK_DIR/magisk/magiskboot" compress=xz "$WORK_DIR/magisk/magisk32" "$WORK_DIR/magisk/magisk32.xz"
"$WORK_DIR/magisk/magiskboot" compress=xz "$WORK_DIR/magisk/stub.apk" "$WORK_DIR/magisk/stub.xz"
echo "KEEPFORCEENCRYPT=true" >> "$WORK_DIR/magisk/config"
echo "PREINITDEVICE=sde" >> "$WORK_DIR/magisk/config"
- "$WORK_DIR/magisk/magiskboot" cpio "$WORK_DIR/wsa/$ARCH/Tools/initrd.img" "mv /init /wsainit" "add 0750 /lspinit ../bin/$ARCH/lspinit" "ln /lspinit /init" "add 0750 /magiskinit $WORK_DIR/magisk/magiskinit" "mkdir 0750 overlay.d" "mkdir 0750 overlay.d/sbin" "add 0644 overlay.d/sbin/magisk64.xz $WORK_DIR/magisk/magisk64.xz" "add 0644 overlay.d/sbin/stub.xz $WORK_DIR/magisk/stub.xz" "mkdir 000 .backup" "add 000 .backup/.magisk $WORK_DIR/magisk/config" || abort "Unable to patch initrd"
+ "$WORK_DIR/magisk/magiskboot" cpio "$WORK_DIR/wsa/$ARCH/Tools/initrd.img" "mv /init /wsainit" "add 0750 /lspinit ../bin/$ARCH/lspinit" "ln /lspinit /init" "add 0750 /magiskinit $WORK_DIR/magisk/magiskinit" "mkdir 0750 overlay.d" "mkdir 0750 overlay.d/sbin" "add 0644 overlay.d/sbin/magisk64.xz $WORK_DIR/magisk/magisk64.xz" "add 0644 overlay.d/sbin/magisk32.xz $WORK_DIR/magisk/magisk32.xz" "add 0644 overlay.d/sbin/stub.xz $WORK_DIR/magisk/stub.xz" "mkdir 000 .backup" "add 000 .backup/.magisk $WORK_DIR/magisk/config" || abort "Unable to patch initrd"
echo -e "Integrate Magisk done\n"
elif [ "$ROOT_SOL" = "kernelsu" ]; then
echo "Integrate KernelSU"
diff --git a/scripts/extractMagisk.py b/scripts/extractMagisk.py
index e6bb972..ee9d1d7 100644
--- a/scripts/extractMagisk.py
+++ b/scripts/extractMagisk.py
@@ -72,6 +72,7 @@ with zipfile.ZipFile(magisk_zip) as zip:
with open(os.environ['WSA_WORK_ENV'], 'w') as environ_file:
environ_file.write(str(env))
extract_as(zip, f"lib/{ abi_map[arch][0] }/libmagisk64.so", "magisk64", "magisk")
+ extract_as(zip, f"lib/{ abi_map[arch][1] }/libmagisk32.so", "magisk32", "magisk")
standalone_policy = False
try:
zip.getinfo(f"lib/{ abi_map[arch][0] }/libmagiskpolicy.so")