From c1c648a1f8fd2e01a405cb4efd15ab60b412003e Mon Sep 17 00:00:00 2001 From: solohsu Date: Tue, 14 May 2019 23:46:26 +0800 Subject: [PATCH] Use different Magisk module ID for each variant --- edxp-core/build.gradle | 13 +++++++---- .../EdXposedUninstaller_rec-v2.zip | Bin 2543 -> 0 bytes .../EdXposedUninstaller_rec-v3.zip | Bin 0 -> 2575 bytes .../META-INF/com/google/android/update-binary | 22 +++++++++--------- edxp-core/tpl/module.prop.tpl | 2 +- 5 files changed, 21 insertions(+), 16 deletions(-) delete mode 100644 edxp-core/misc/EdXposedUninstaller/EdXposedUninstaller_rec-v2.zip create mode 100644 edxp-core/misc/EdXposedUninstaller/EdXposedUninstaller_rec-v3.zip diff --git a/edxp-core/build.gradle b/edxp-core/build.gradle index e5840050..db4800ed 100644 --- a/edxp-core/build.gradle +++ b/edxp-core/build.gradle @@ -11,11 +11,14 @@ ext { jar_dest_dir = "${projectDir}/template_override/system/framework/" is_windows = OperatingSystem.current().isWindows() backends = ["YAHFA", "SandHook", "Whale"] + yahfa_module_id = "riru_edxposed" + sandhook_module_id = yahfa_module_id + "_sandhook" + whale_module_id = yahfa_module_id + "_whale" yahfa_authors = "solohsu, rk700 & MlgmXyysd" sandhook_authors = "solohsu, ganyao114 & MlgmXyysd" whale_authors = "solohsu, asLody & MlgmXyysd" - moduleId = "edxp" + riruModuleId = "edxp" libPathRelease = "$buildDir/ndkBuild/release/lib" zipPathMagiskRelease = "$buildDir/tmp/release/magisk" } @@ -99,7 +102,7 @@ task copyFilesMagiskRelease { } copy { from 'template_override/riru_module.prop' - into "$zipPathMagiskRelease/data/misc/riru/modules/${moduleId}" + into "$zipPathMagiskRelease/data/misc/riru/modules/${riruModuleId}" } copy { from "$libPathRelease/armeabi-v7a" @@ -119,7 +122,7 @@ task copyFilesMagiskRelease { } file("$zipPathMagiskRelease/riru_module.prop").delete() - file("$zipPathMagiskRelease/data/misc/riru/modules/${moduleId}/riru_module.prop").renameTo("$zipPathMagiskRelease/data/misc/riru/modules/${moduleId}/module.prop") + file("$zipPathMagiskRelease/data/misc/riru/modules/${riruModuleId}/riru_module.prop").renameTo("$zipPathMagiskRelease/data/misc/riru/modules/${riruModuleId}/module.prop") } } @@ -135,6 +138,7 @@ afterEvaluate { def backendLowered = backend.toLowerCase() def backendCapped = backendLowered.capitalize() def authorList = property("${backendLowered}" + "_authors") + def magiskModuleId = property("${backendLowered}" + "_module_id") def prepareJarsTask = task("prepareJars${backendCapped}${variantCapped}") { dependsOn cleanTemplate, copyDalvikdxJar, copyDexmakerJar @@ -159,7 +163,8 @@ afterEvaluate { from "${projectDir}/tpl/module.prop.tpl" into templateRootPath rename "module.prop.tpl", "module.prop" - expand(backend: "$backendCapped", versionName: "$version" + "($backend)", + expand(moduleId: "$magiskModuleId", backend: "$backendCapped", + versionName: "$version" + "($backend)", versionCode: "$versionCode", authorList: "$authorList") filter(FixCrLfFilter.class, eol: FixCrLfFilter.CrLf.newInstance("lf")) } diff --git a/edxp-core/misc/EdXposedUninstaller/EdXposedUninstaller_rec-v2.zip b/edxp-core/misc/EdXposedUninstaller/EdXposedUninstaller_rec-v2.zip deleted file mode 100644 index ac54535634ccdcdfd1e0f1d9a7eb5bb7ee3e48f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2543 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 g#tR3c/dev/null if [ -d "/data/adb/magisk/" ]; then -ui_print "- Deleting EdXposed..." -rm -r -f /data/adb/modules/riru_edxposed/ -rm -r -f /data/misc/riru/modules/edxposed/ -rm -r -f /data/misc/riru/modules/edxp/ -ui_print "- Done" +remove_edxposed exit 0 fi @@ -186,10 +191,5 @@ for LOOP in 0 1 2 3 4 5 6 7; do fi done -ui_print "- Deleting EdXposed..." -rm -r -f /magisk/riru_edxposed/ -rm -r -f /data/misc/riru/modules/edxposed/ -rm -r -f /data/misc/riru/modules/edxp/ - -ui_print "- Done" +remove_edxposed exit 0 diff --git a/edxp-core/tpl/module.prop.tpl b/edxp-core/tpl/module.prop.tpl index 2959c8bc..54374152 100644 --- a/edxp-core/tpl/module.prop.tpl +++ b/edxp-core/tpl/module.prop.tpl @@ -1,4 +1,4 @@ -id=riru_edxposed +id=${moduleId} name=Riru - Ed Xposed version=${versionName} versionCode=${versionCode}