From 7e7363f64bb5f214ee1a841068a3b79db7ca6a13 Mon Sep 17 00:00:00 2001
From: LoveSy <631499712@qq.com>
Date: Thu, 17 Mar 2022 18:59:39 +0800
Subject: [PATCH] Adapt to standalone magiskpolicy

https://github.com/topjohnwu/Magisk/commit/fa8900be659ce05bb21f682b90058c0592edf967
---
 .github/workflows/magisk.yml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/magisk.yml b/.github/workflows/magisk.yml
index 2fe9726..640cada 100644
--- a/.github/workflows/magisk.yml
+++ b/.github/workflows/magisk.yml
@@ -195,11 +195,23 @@ jobs:
           with zipfile.ZipFile(out_file) as zip:
               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
               extract_as(zip, f"lib/{ abi_map[arch][0] }/libmagiskinit.so", "magiskinit", "magisk")
-              extract_as(zip, f"lib/{ abi_map[arch][0] }/libmagiskinit.so", "magiskpolicy", "magisk")
+              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] }/libmagiskboot.so", "magiskboot", "magisk")
               extract_as(zip, f"lib/{ abi_map[arch][0] }/libbusybox.so", "busybox", "magisk")
-              extract_as(zip, f"lib/{ abi_map['x64'][0] }/libmagiskinit.so", "magiskpolicy", ".")
+              if standalone_policy:
+                extract_as(zip, f"lib/{ abi_map['x64'][0] }/libmagiskpolicy.so", "magiskpolicy", ".")
+              else:
+                extract_as(zip, f"lib/{ abi_map['x64'][0] }/libmagiskinit.so", "magiskpolicy", ".")
               extract_as(zip, f"assets/boot_patch.sh", "boot_patch.sh", "magisk")
               extract_as(zip, f"assets/util_functions.sh", "util_functions.sh", "magisk")
       - name: Download OpenGApps
@@ -304,7 +316,8 @@ jobs:
               chmod 0755 /dev/wsa-magisk/magisk32
               copy /sbin/magiskinit /dev/wsa-magisk/magiskinit
               chmod 0755 /dev/wsa-magisk/magiskinit
-              symlink ./magiskinit /dev/wsa-magisk/magiskpolicy
+              copy /sbin/magiskpolicy /dev/wsa-magisk/magiskpolicy
+              chmod 0755 /dev/wsa-magisk/magiskpolicy
               mkdir /dev/wsa-magisk/.magisk 700
               mkdir /dev/wsa-magisk/.magisk/mirror 700
               mkdir /dev/wsa-magisk/.magisk/block 700