Fix arm64 build

LSPosed · Feb 7, 2024 · ccef439 · ccef439
1 parent ad6f29a
commit ccef439
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 109 deletions.
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with MagiskOnWSALocal.  If not, see <https://www.gnu.org/licenses/>.
 #
-# Copyright (C) 2023 LSPosed Contributors
+# Copyright (C) 2024 LSPosed Contributors
 #
 
 if [ ! "$BASH_VERSION" ]; then
@@ -420,8 +420,6 @@ if [ "$ROOT_SOL" = "magisk" ]; then
             abort "Please install Magisk 26.0+"
         fi
         sudo chmod +x "../linker/$HOST_ARCH/linker64" || abort
-        sudo patchelf --set-interpreter "../linker/$HOST_ARCH/linker64" "$WORK_DIR/magisk/magiskpolicy" || abort
-        chmod +x "$WORK_DIR/magisk/magiskpolicy" || abort
         chmod +x "$WORK_DIR/magisk/magiskboot" || abort
     elif [ -z "${CUSTOM_MAGISK+x}" ]; then
         echo "The Magisk zip package does not exist, is the download incomplete?"

diff --git a/scripts/extractMagisk.py b/scripts/extractMagisk.py
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with MagiskOnWSALocal.  If not, see <https://www.gnu.org/licenses/>.
 #
-# Copyright (C) 2023 LSPosed Contributors
+# Copyright (C) 2024 LSPosed Contributors
 #
 
 import sys
@@ -73,15 +73,5 @@ def extract_as(zip, name, as_name, dir):
             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")
-        standalone_policy = True
-    except:
-        pass
-    if standalone_policy:
-        extract_as(zip, f"lib/{ abi_map[arch][0] }/libmagiskpolicy.so", "magiskpolicy", "magisk")
-    else:
-        extract_as(zip, f"lib/{ abi_map[arch][0] }/libmagiskinit.so", "magiskpolicy", "magisk")
     extract_as(zip, f"lib/{ abi_map[arch][0] }/libmagiskinit.so", "magiskinit", "magisk")
-    extract_as(zip, f"lib/{ abi_map[arch][0] }/libmagiskboot.so", "magiskboot", "magisk")
+    extract_as(zip, f"lib/{ abi_map[host_abi][0] }/libmagiskboot.so", "magiskboot", "magisk")
diff --git a/scripts/fixGappsProp.py b/scripts/fixGappsProp.py
diff --git a/scripts/generateGappsLink.py b/scripts/generateGappsLink.py
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with MagiskOnWSALocal.  If not, see <https://www.gnu.org/licenses/>.
 #
-# Copyright (C) 2023 LSPosed Contributors
+# Copyright (C) 2024 LSPosed Contributors
 #
 
 from datetime import datetime