From 74f4404d7a783e9db6266cc1a54b125a679e2be6 Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Sun, 7 Mar 2021 02:46:57 +0800
Subject: [PATCH] [core] Merge manager into Magisk zip

---
 core/build.gradle.kts                                      | 7 +++++++
 .../java/io/github/lsposed/lspd/service/ConfigManager.java | 2 +-
 core/template_override/customize.sh                        | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 53a395e5..e96a433b 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -155,6 +155,7 @@ afterEvaluate {
 
         val prepareMagiskFilesTask = task("prepareMagiskFiles$variantCapped") {
             dependsOn("assemble$variantCapped")
+            dependsOn(":app:assemble$variantCapped")
             doFirst {
                 copy {
                     from("$projectDir/tpl/module.prop.tpl")
@@ -225,6 +226,12 @@ afterEvaluate {
                     from("$libPathRelease/x86_64")
                     into("$zipPathMagiskReleasePath/system_x86/lib64")
                 }
+                copy {
+                    from("${project(":app").projectDir}/build/outputs/apk/${variantLowered}")
+                    include("*.apk")
+                    rename(".*\\.apk", "manager.apk")
+                    into(zipPathMagiskReleasePath)
+                }
                 // generate sha1sum
                 fileTree(zipPathMagiskReleasePath).matching {
                     exclude("README.md", "META-INF")
diff --git a/core/src/main/java/io/github/lsposed/lspd/service/ConfigManager.java b/core/src/main/java/io/github/lsposed/lspd/service/ConfigManager.java
index 1f91f34c..7575061b 100644
--- a/core/src/main/java/io/github/lsposed/lspd/service/ConfigManager.java
+++ b/core/src/main/java/io/github/lsposed/lspd/service/ConfigManager.java
@@ -239,7 +239,7 @@ public class ConfigManager {
     public void ensureManager() {
         if (!packageStarted) return;
         new Thread(() -> {
-            if (PackageService.installManagerIfAbsent(manager, new File("/data/adb/lspd/base.apk"))) {
+            if (PackageService.installManagerIfAbsent(manager, new File(basePath, "manager.apk"))) {
                 updateManager(BuildConfig.DEFAULT_MANAGER_PACKAGE_NAME);
             }
         }).start();
diff --git a/core/template_override/customize.sh b/core/template_override/customize.sh
index dfc86ac6..ea9bf8c6 100644
--- a/core/template_override/customize.sh
+++ b/core/template_override/customize.sh
@@ -197,6 +197,7 @@ touch /data/adb/lspd/new_install || abortC "! ${LANG_CUST_ERR_CONF_FIRST}"
 ui_print "- ${LANG_CUST_INST_COPY_LIB}"
 rm -rf "/data/adb/lspd/framework"
 mv "${MODPATH}/system/framework" "/data/adb/lspd/framework"
+extract "${ZIPFILE}" 'manager.apk' "/data/adb/lspd/"
 mkdir -p /data/misc/$MISC_PATH
 set_perm /data/misc/$MISC_PATH 0 0 0771 "u:object_r:magisk_file:s0" || abortC "! ${LANG_CUST_ERR_PERM}"