WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[core] Merge manager into Magisk zip

This commit is contained in:
LoveSy 2021-03-07 02:46:57 +08:00 committed by tehcneko
parent 46c15c0961
commit 74f4404d7a
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/build.gradle.kts
View File

@ -155,6 +155,7 @@ afterEvaluate {
val prepareMagiskFilesTask = task("prepareMagiskFiles$variantCapped") { val prepareMagiskFilesTask = task("prepareMagiskFiles$variantCapped") {
dependsOn("assemble$variantCapped") dependsOn("assemble$variantCapped")
dependsOn(":app:assemble$variantCapped")
doFirst { doFirst {
copy { copy {
from("$projectDir/tpl/module.prop.tpl") from("$projectDir/tpl/module.prop.tpl")
@ -225,6 +226,12 @@ afterEvaluate {
from("$libPathRelease/x86_64") from("$libPathRelease/x86_64")
into("$zipPathMagiskReleasePath/system_x86/lib64") into("$zipPathMagiskReleasePath/system_x86/lib64")
} }
copy {
from("${project(":app").projectDir}/build/outputs/apk/${variantLowered}")
include("*.apk")
rename(".*\\.apk", "manager.apk")
into(zipPathMagiskReleasePath)
}
// generate sha1sum // generate sha1sum
fileTree(zipPathMagiskReleasePath).matching { fileTree(zipPathMagiskReleasePath).matching {
exclude("README.md", "META-INF") exclude("README.md", "META-INF")

2
core/src/main/java/io/github/lsposed/lspd/service/ConfigManager.java
View File

@ -239,7 +239,7 @@ public class ConfigManager {
public void ensureManager() { public void ensureManager() {
if (!packageStarted) return; if (!packageStarted) return;
new Thread(() -> { 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); updateManager(BuildConfig.DEFAULT_MANAGER_PACKAGE_NAME);
} }
}).start(); }).start();

1
core/template_override/customize.sh
View File

@ -197,6 +197,7 @@ touch /data/adb/lspd/new_install || abortC "! ${LANG_CUST_ERR_CONF_FIRST}"
ui_print "- ${LANG_CUST_INST_COPY_LIB}" ui_print "- ${LANG_CUST_INST_COPY_LIB}"
rm -rf "/data/adb/lspd/framework" rm -rf "/data/adb/lspd/framework"
mv "${MODPATH}/system/framework" "/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 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}" set_perm /data/misc/$MISC_PATH 0 0 0771 "u:object_r:magisk_file:s0" || abortC "! ${LANG_CUST_ERR_PERM}"