diff --git a/Android.mk b/Android.mk index b01179c..e06cf77 100644 --- a/Android.mk +++ b/Android.mk @@ -3,11 +3,11 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := magisk -LOCAL_SRC_FILES := magisk.apk +LOCAL_SRC_FILES := rootfs/vendor/etc/init/magisk/magisk.apk LOCAL_MODULE_CLASS := APPS LOCAL_CERTIFICATE := platform LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/init/ +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/init/magisk LOCAL_ENFORCE_USES_LIBRARIES := false LOCAL_DEX_PREOPT := false diff --git a/README.md b/README.md index 2c80d3d..fbbf77e 100644 --- a/README.md +++ b/README.md @@ -9,21 +9,24 @@ - ✅ 集成了 MD5 校验确保文件完整性 - ✅ 改进了二进制文件提取逻辑 - ✅ 更新了 init 服务配置 -- ✅ 添加了自动构建时提取 +- ✅ 优化了构建流程配置 ## 使用方法 -1. 运行提取脚本自动下载并提取 Magisk v30.2: +1. **构建前准备**:运行提取脚本自动下载并提取 Magisk v30.2: ```bash python3 extract.py ``` -2. 或者直接进行 Android 构建,二进制文件会自动下载和提取 + +2. **进行 Android 构建**:在你的设备配置中包含此 vendor 脚本会自动: - 从官方 GitHub 下载 Magisk v30.2 APK -- 验证文件 MD5 校验和 (2691c30ccf059af2536cb0af803c787c) +- 验证文件 MD5 校验和 (2691c30ccf059af2536cb0af803c787c) - 提取二进制文件到 rootfs 目录 +**注意**:请确保在 Android 构建之前先运行 `extract.py` 脚本来准备所需的文件。 + ## 目录结构 ``` diff --git a/device.mk b/device.mk index 0d4c9da..145c076 100644 --- a/device.mk +++ b/device.mk @@ -4,8 +4,9 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ vendor/magisk/magisk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk.rc \ - $(call find-copy-subdir-files,*,vendor/magisk/rootfs/vendor/etc/init,$(TARGET_COPY_OUT_VENDOR)/etc/init) \ - -# Extract Magisk binaries from APK during build -$(shell cd vendor/magisk && python3 extract.py) - + vendor/magisk/rootfs/vendor/etc/init/magisk/busybox:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk/busybox \ + vendor/magisk/rootfs/vendor/etc/init/magisk/magisk32:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk/magisk32 \ + vendor/magisk/rootfs/vendor/etc/init/magisk/magisk64:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk/magisk64 \ + vendor/magisk/rootfs/vendor/etc/init/magisk/magiskboot:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk/magiskboot \ + vendor/magisk/rootfs/vendor/etc/init/magisk/magiskinit:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk/magiskinit \ + vendor/magisk/rootfs/vendor/etc/init/magisk/magiskpolicy:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk/magiskpolicy \ diff --git a/rootfs/vendor/etc/init/magisk/busybox b/rootfs/vendor/etc/init/magisk/busybox deleted file mode 100755 index fed1fbd..0000000 Binary files a/rootfs/vendor/etc/init/magisk/busybox and /dev/null differ diff --git a/rootfs/vendor/etc/init/magisk/magisk32 b/rootfs/vendor/etc/init/magisk/magisk32 deleted file mode 100644 index bc0d31d..0000000 Binary files a/rootfs/vendor/etc/init/magisk/magisk32 and /dev/null differ diff --git a/rootfs/vendor/etc/init/magisk/magisk64 b/rootfs/vendor/etc/init/magisk/magisk64 deleted file mode 100755 index baf819f..0000000 Binary files a/rootfs/vendor/etc/init/magisk/magisk64 and /dev/null differ diff --git a/rootfs/vendor/etc/init/magisk/magiskboot b/rootfs/vendor/etc/init/magisk/magiskboot deleted file mode 100755 index 9c139ed..0000000 Binary files a/rootfs/vendor/etc/init/magisk/magiskboot and /dev/null differ diff --git a/rootfs/vendor/etc/init/magisk/magiskinit b/rootfs/vendor/etc/init/magisk/magiskinit deleted file mode 100755 index 9496503..0000000 Binary files a/rootfs/vendor/etc/init/magisk/magiskinit and /dev/null differ diff --git a/rootfs/vendor/etc/init/magisk/magiskpolicy b/rootfs/vendor/etc/init/magisk/magiskpolicy deleted file mode 100755 index d31fd4e..0000000 Binary files a/rootfs/vendor/etc/init/magisk/magiskpolicy and /dev/null differ