From 3a1641cd7b62f3cec1bc607c979e7697e089bab0 Mon Sep 17 00:00:00 2001 From: Jim Wu Date: Sat, 19 Dec 2020 10:11:03 +0800 Subject: [PATCH] Description update --- README.md | 31 +++++++-------------- edxp-core/build.gradle | 13 ++------- edxp-core/template_override/README.md | 4 +-- edxp-core/template_override/module.prop.new | 6 ---- edxp-core/template_override/verify.sh | 8 +++--- edxp-core/tpl/module.prop.tpl | 3 +- edxp-core/tpl/riru_module.prop.tpl | 6 ---- 7 files changed, 20 insertions(+), 51 deletions(-) delete mode 100644 edxp-core/template_override/module.prop.new delete mode 100644 edxp-core/tpl/riru_module.prop.tpl diff --git a/README.md b/README.md index 3bd6532a..3691e02b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # EdXposed Framework -[![Latest builds](https://ci.appveyor.com/api/projects/status/qu3vj1d64nqia1b8/branch/master?svg=true)](https://ci.appveyor.com/project/ElderDrivers/edxposed/branch/master) ![Android CI](https://github.com/ElderDrivers/EdXposed/workflows/Android%20CI/badge.svg)[![中文说明文档](art/README_CN.png)](README_CN.md) +[![Latest builds](https://ci.appveyor.com/api/projects/status/qu3vj1d64nqia1b8/branch/master?svg=true)](https://ci.appveyor.com/project/ElderDrivers/edxposed/branch/master) ![Android CI](https://github.com/ElderDrivers/EdXposed/workflows/Android%20CI/badge.svg) [![中文说明文档](art/README_CN.png)](README_CN.md) ## Introduction @@ -10,10 +10,10 @@ A Riru module trying to provide an ART hooking framework (initially for Android ## Supported Versions -- Android R (11)[sdk30] (Experimental) -- Android Q (10)[sdk29] -- Android Pie (9)[sdk28] -- Android Oreo (8.x)[sdk26/27] +- Android R (11, sdk30) (Experimental) +- Android Q (10, sdk29) +- Android Pie (9, sdk28) +- Android Oreo (8.x, sdk26/27) For Android Nougat (7.x) and lower, please use the original Xposed Framework. @@ -24,18 +24,16 @@ and zip binaries can be downloaded from [here](http://gnuwin32.sourceforge.net/p ## Build -1. Execute task `:edxp-core:[zip|push][Yahfa|Sandhook]Release` to build flashable zip for corresponding variant. +1. Execute task `:edxp-core:zip[Yahfa|Sandhook]Release` to build flashable zip for corresponding variant. 2. Find the flashable under `edxp-core/release/`. 3. Flash the zip in recovery mode or via Magisk Manager. ## Install -### For latest Canary build, you need Magisk v21+ and Riru-Core v23+. - -1. Install Magisk v19+ (for Huawei/Honor or OnePlus 7T/7TPro device, Magisk v20.2+ is required) -2. Install [Riru-Core](https://github.com/RikkaApps/Riru/releases) v19+ from Magisk repo. -3. [Download](#download) and install EdXposed in Magisk Manager or recovery mode. -4. Install [companion application](#companion-applications). +1. Install Magisk v21+ +2. Install [Riru](https://github.com/RikkaApps/Riru/releases) v23+ from Magisk repo. +3. [Download](#download) and install EdXposed in Magisk Manager or recovery. +4. Install [EdXposed Manager](https://github.com/ElderDrivers/EdXposedManager). 4. Reboot. 5. Have fun! :) @@ -52,15 +50,6 @@ Edxposed has three different builds - Canary: Debug version. Automatically build by CI. ***Download Canary version in [[EdXposed Manager](https://github.com/ElderDrivers/EdXposedManager)]*** -## Companion Applications - -> Both Xposed Installer and EdXposed Installer are deprecated. Support will be stopped for later versions. Please use [EdXposed Manager](https://github.com/ElderDrivers/EdXposedManager) - -- For v0.2.9.5 and before: [Xposed Installer](https://github.com/DVDAndroid/XposedInstaller). -- For v0.2.9.6 and v0.2.9.7: [Xposed Installer](https://github.com/DVDAndroid/XposedInstaller) + [EdXp Manager](https://github.com/solohsu/EdXpManager)(optional). -- For v0.2.9.8 and later: [EdXposed Installer](https://github.com/solohsu/XposedInstaller) and [EdXposed Manager](https://github.com/ElderDrivers/EdXposedManager). -- For the latest version, we recommend to use [EdXposed Manager](https://github.com/ElderDrivers/EdXposedManager). - ## Useful Links - [List of Xposed Modules For Android Pie Working With EdXposed](https://forum.xda-developers.com/xposed/list-xposed-modules-android-pie-ed-t3892768) (thanks to Uraniam9 @ xda-developers) diff --git a/edxp-core/build.gradle b/edxp-core/build.gradle index 5ea73a28..67c83c94 100644 --- a/edxp-core/build.gradle +++ b/edxp-core/build.gradle @@ -150,16 +150,7 @@ afterEvaluate { expand(moduleId: "$magiskModuleId", backend: "$backendCapped", versionName: "$version" + " ($backend)", versionCode: "$versionCode", authorList: "$authorList", - apiCode: "$apiCode") - filter(FixCrLfFilter.class, eol: FixCrLfFilter.CrLf.newInstance("lf")) - } - copy { - from "${projectDir}/tpl/riru_module.prop.tpl" - into "$templateRootPath/riru" - rename "riru_module.prop.tpl", "module.prop.new" - expand(minApi: "$moduleMinRiruApiVersion", - versionName: "$version" + " ($backend)", - versionCode: "$versionCode", authorList: "$authorList") + apiCode: "$apiCode", minApi: "$moduleMinRiruApiVersion") filter(FixCrLfFilter.class, eol: FixCrLfFilter.CrLf.newInstance("lf")) } } @@ -208,7 +199,7 @@ afterEvaluate { exclude "README.md", "META-INF" }.visit { f -> if (f.directory) return - file(f.file.path + ".sha256sum").text = calcSha256(f.file) + file(f.file.path + ".s").text = calcSha256(f.file) } } } diff --git a/edxp-core/template_override/README.md b/edxp-core/template_override/README.md index 5949a9e2..994b060c 100644 --- a/edxp-core/template_override/README.md +++ b/edxp-core/template_override/README.md @@ -10,7 +10,7 @@ A Riru module trying to provide an ART hooking framework (initially for Android What are the differences between EdXposed Framework and Xposed Framework? -1. EdXposed fully supports Android Pie and Q (even R) +1. EdXposed fully supports Android Pie, Q and R 2. EdXposed have App List mode. Only the apps you want to apply Xposed modules are hooked. Other apps in system run in a completely clean environment 3. EdXposed doesn't need to reboot system to active most modules 4. EdXposed is hard to detect. EdXposed use Riru to inject, doesn't modify the libart and app_process @@ -20,7 +20,7 @@ What are the differences between EdXposed Framework and Xposed Framework? To put it simply, just follow these steps: 1. Install Magisk -2. Flash the Riru - Core Magisk module. You can find it in [Riru release page](https://github.com/RikkaApps/Riru/releases). +2. Flash the Riru Magisk module. You can find it in [Riru release page](https://github.com/RikkaApps/Riru/releases). 3. Flash the Riru - EdXposed Magisk module. You can find it in [EdXposed release page](https://github.com/ElderDrivers/EdXposed/releases). 4. Install EdXposed Manager. You can find it in [EdXposed Manager release page](https://github.com/ElderDrivers/EdXposedManager/releases). 5. Reboot :) diff --git a/edxp-core/template_override/module.prop.new b/edxp-core/template_override/module.prop.new deleted file mode 100644 index 792f752d..00000000 --- a/edxp-core/template_override/module.prop.new +++ /dev/null @@ -1,6 +0,0 @@ -name=Riru - EdXposed -version=v0.5.1.1 (YAHFA) -versionCode=233 -author=solohsu, MlgmXyysd & rk700 -description=Another enhanced implementation of Xposed Framework. Supports Android 8.0, 8.1, 9, 10 or above. Requires Riru - Core v19 or above installed. Telegram: @EdXposed -minApi=9 diff --git a/edxp-core/template_override/verify.sh b/edxp-core/template_override/verify.sh index b04a9ea3..e78bdd10 100644 --- a/edxp-core/template_override/verify.sh +++ b/edxp-core/template_override/verify.sh @@ -22,17 +22,17 @@ extract() { hash_path="" if [ $junk_paths = true ]; then file_path="$dir/$(basename "$file")" - hash_path="$TMPDIR_FOR_VERIFY/$(basename "$file").sha256sum" + hash_path="$TMPDIR_FOR_VERIFY/$(basename "$file").s" else file_path="$dir/$file" - hash_path="$TMPDIR_FOR_VERIFY/$file.sha256sum" + hash_path="$TMPDIR_FOR_VERIFY/$file.s" fi unzip $opts "$zip" "$file" -d "$dir" >&2 [ -f "$file_path" ] || abort_verify "$file not exists" - unzip $opts "$zip" "$file.sha256sum" -d "$TMPDIR_FOR_VERIFY" >&2 - [ -f "$hash_path" ] || abort_verify "$file.sha256sum not exists" + unzip $opts "$zip" "$file.s" -d "$TMPDIR_FOR_VERIFY" >&2 + [ -f "$hash_path" ] || abort_verify "$file.s not exists" (echo "$(cat "$hash_path") $file_path" | sha256sum -c -s -) || abort_verify "Failed to verify $file" ui_print "- Verified $file" >&1 diff --git a/edxp-core/tpl/module.prop.tpl b/edxp-core/tpl/module.prop.tpl index 31dcd2f2..32f415e9 100644 --- a/edxp-core/tpl/module.prop.tpl +++ b/edxp-core/tpl/module.prop.tpl @@ -4,4 +4,5 @@ version=${versionName} versionCode=${versionCode} author=${authorList} api=${apiCode} -description=Another enhanced implementation of Xposed Framework. Supports Android 8.0, 8.1, 9, 10, 11 or above. Requires Riru - Core v23 or above installed. Telegram: @EdXposed +description=Another enhanced implementation of Xposed Framework. Supports Android 8.0, 8.1, 9, 10, 11 or above. Requires Riru v23 or above installed. Telegram: @EdXposed +minApi=${minApi} \ No newline at end of file diff --git a/edxp-core/tpl/riru_module.prop.tpl b/edxp-core/tpl/riru_module.prop.tpl deleted file mode 100644 index d771a31f..00000000 --- a/edxp-core/tpl/riru_module.prop.tpl +++ /dev/null @@ -1,6 +0,0 @@ -name=Riru - EdXposed -version=${versionName} -versionCode=${versionCode} -author=${authorList} -description=Another enhanced implementation of Xposed Framework. Supports Android 8.0, 8.1, 9, 10, 11 or above. Requires Riru - Core v23 or above installed. Telegram: @EdXposed -minApi=${minApi}