fix: 更新 Android.mk 和 device.mk 文件,移除不必要的模块定义,调整文件复制路径,确保 magisk 相关文件的正确构建和安装。

This commit is contained in:
2025-09-18 19:20:29 +08:00
parent ef00365797
commit dae04ca5df
2 changed files with 8 additions and 43 deletions

View File

@@ -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)

View File

@@ -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