From b067d7e11a8484ed71b493b31c10621b214a0de1 Mon Sep 17 00:00:00 2001
From: CoderKang <CoderKang@hotmail.com>
Date: Thu, 18 Sep 2025 18:11:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=20Android.mk=20?=
 =?UTF-8?q?=E5=92=8C=20device.mk=20=E6=96=87=E4=BB=B6=EF=BC=8C=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E6=A8=A1=E5=9D=97=E5=AE=9A=E4=B9=89=E5=92=8C=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6=E8=B7=AF=E5=BE=84=EF=BC=8C=E7=A1=AE=E4=BF=9D=20magisk?=
 =?UTF-8?q?=20=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6=E7=9A=84=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E6=9E=84=E5=BB=BA=E5=92=8C=E5=AE=89=E8=A3=85=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Android.mk | 42 +++++++++++++++++++++++++++++++-----------
 device.mk  | 17 +++++++++--------
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/Android.mk b/Android.mk
index 1a547f6..636ef20 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,15 +1,35 @@
+# vendor/magisk/Android.mk
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-
-LOCAL_MODULE := magisk
-LOCAL_SRC_FILES := magisk.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/init/magisk
-
-LOCAL_ENFORCE_USES_LIBRARIES := false
-LOCAL_DEX_PREOPT := false
-
+LOCAL_MODULE            := magisk_apk_flat
+LOCAL_SRC_FILES         := magisk.apk
+LOCAL_MODULE_CLASS      := ETC
+LOCAL_MODULE_STEM       := magisk.apk
+LOCAL_MODULE_PATH       := $(TARGET_OUT)/etc/init/magisk
 include $(BUILD_PREBUILT)
+
+define install_exec
+include $(CLEAR_VARS)
+LOCAL_MODULE            := $(1)_bin
+LOCAL_SRC_FILES         := $(1)
+LOCAL_MODULE_CLASS      := EXECUTABLES
+LOCAL_MODULE_STEM       := $(1)
+LOCAL_MODULE_PATH       := $(TARGET_OUT)/etc/init/magisk
+include $(BUILD_PREBUILT)
+endef
+
+$(call install_exec,busybox)
+$(call install_exec,init-ld)
+$(call install_exec,magisk)
+$(call install_exec,magisk64)
+$(call install_exec,magiskboot)
+$(call install_exec,magiskinit)
+$(call install_exec,magiskpolicy)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := magisk
+LOCAL_REQUIRED_MODULES := \
+    magisk_apk_flat \
+    busybox_bin init-ld_bin magisk_bin magisk64_bin magiskboot_bin magiskinit_bin magiskpolicy_bin
+include $(BUILD_PHONY_PACKAGE)
diff --git a/device.mk b/device.mk
index c0a6ce3..d5142e8 100644
--- a/device.mk
+++ b/device.mk
@@ -1,11 +1,12 @@
 PRODUCT_PACKAGES += \
-    magisk
+    magisk_apk_flat \
+    busybox_bin \
+    init-ld_bin \
+    magisk_bin \
+    magisk64_bin \
+    magiskboot_bin \
+    magiskinit_bin \
+    magiskpolicy_bin
 
 PRODUCT_COPY_FILES += \
-    $(shell mkdir -p $(TARGET_OUT)/sbin) \
-    vendor/magisk/magisk.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk.rc \
-    vendor/magisk/magisk:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magisk \
-    vendor/magisk/magiskpolicy:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magiskpolicy \
-    vendor/magisk/magiskboot:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magiskboot \
-    vendor/magisk/magiskinit:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magiskinit \
-    vendor/magisk/busybox:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/busybox
+    vendor/magisk/magisk.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk.rc:0644