From dae04ca5df61893271973232a9da999b699bc9f9 Mon Sep 17 00:00:00 2001
From: CoderKang <CoderKang@hotmail.com>
Date: Thu, 18 Sep 2025 19:20:29 +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=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=EF=BC=8C=E8=B0=83=E6=95=B4=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E8=B7=AF=E5=BE=84=EF=BC=8C=E7=A1=AE=E4=BF=9D?=
 =?UTF-8?q?=20magisk=20=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E6=9E=84=E5=BB=BA=E5=92=8C=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Android.mk | 33 ---------------------------------
 device.mk  | 18 ++++++++----------
 2 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/Android.mk b/Android.mk
index 8737341..e69de29 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,33 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-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         := magisk/$(1)
-LOCAL_MODULE_CLASS      := EXECUTABLES
-LOCAL_MODULE_STEM       := $(1)
-LOCAL_MODULE_PATH       := $(TARGET_OUT)/etc/init/magisk
-include $(BUILD_PREBUILT)
-endef
-
-$(call install_exec,magisk)
-$(call install_exec,busybox)
-$(call install_exec,init-ld)
-$(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 magiskboot_bin magiskinit_bin magiskpolicy_bin
-include $(BUILD_PHONY_PACKAGE)
diff --git a/device.mk b/device.mk
index 23b0610..068c524 100644
--- a/device.mk
+++ b/device.mk
@@ -1,11 +1,9 @@
-PRODUCT_PACKAGES += \
-    magisk_apk_flat \
-    busybox_bin \
-    init-ld_bin \
-    magisk_bin \
-    magiskboot_bin \
-    magiskinit_bin \
-    magiskpolicy_bin
-
 PRODUCT_COPY_FILES += \
-    vendor/magisk/magisk.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk.rc:0644
+    vendor/magisk/magisk.apk:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magisk.apk:0644 \
+    vendor/magisk/magisk/magisk:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magisk:0755 \
+    vendor/magisk/magisk/magiskboot:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magiskboot:0755 \
+    vendor/magisk/magisk/magiskinit:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magiskinit:0755 \
+    vendor/magisk/magisk/magiskpolicy:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magiskpolicy:0755 \
+    vendor/magisk/magisk/busybox:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/busybox:0755 \
+    vendor/magisk/magisk/init-ld:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/init-ld:0755 \
+    vendor/magisk/magisk.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk.rc:0644
\ No newline at end of file