From e7a47201698ed889d6023defb2d9b280383ca71e Mon Sep 17 00:00:00 2001 From: Jim Wu Date: Mon, 21 Dec 2020 23:07:28 +0800 Subject: [PATCH] Prepare for alpha release --- README.md | 22 ++------- README_CN.md | 51 ++++++++------------- edxp-core/.gitignore | 1 + edxp-core/template_override/post-fs-data.sh | 2 +- edxp-core/tpl/edconfig.tpl | 2 +- 5 files changed, 27 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 3691e02b7..9146e0316 100644 --- a/README.md +++ b/README.md @@ -10,23 +10,11 @@ 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) - -For Android Nougat (7.x) and lower, please use the original Xposed Framework. - -## Build Requirements - -Same as [Riru-Core's](https://github.com/RikkaApps/Riru/blob/master/README.md#build-requirements) -and zip binaries can be downloaded from [here](http://gnuwin32.sourceforge.net/packages/zip.htm). +[Wiki: Available Android versions](https://github.com/ElderDrivers/EdXposed/wiki/Available-Android-versions) ## Build -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. +[Wiki: Build](https://github.com/ElderDrivers/EdXposed/wiki/Build) ## Install @@ -56,7 +44,7 @@ Edxposed has three different builds ## Known Issues -See [Wiki: Known issues or bugs](https://github.com/ElderDrivers/EdXposed/wiki/Known-issues-or-bugs) +See [Issues](https://github.com/ElderDrivers/EdXposed/issues) ## Get Help @@ -64,9 +52,9 @@ See [Wiki: Known issues or bugs](https://github.com/ElderDrivers/EdXposed/wiki/K - Notice(for Chinese): In view of the low quality of issues submitted, please read the Chinese user report first[EdXposedIssuesReport_cn](http://edxp.meowcat.org/assets/EdXposedIssuesReport_cn.txt)(If you don't read the instructions, the submitted issue is likely to be closed) -## For Developers +## For Developers -Developers are welcomed to write Xposed modules with hooks based on EdXposed Framework. Module written based on EdXposed framework is fully compatible with the original Xposed Framework, so contrary a Xposed Framework-based module will work well with the EdXposed framework too. +Developers are welcomed to write Xposed modules with hooks based on EdXposed Framework. Module written based on EdXposed framework is fully compatible with the original Xposed Framework, so contrary a Xposed Framework-based module will work well with the EdXposed framework too. - [Xposed Framework API](https://api.xposed.info/) diff --git a/README_CN.md b/README_CN.md index 769537c6c..4410b567c 100644 --- a/README_CN.md +++ b/README_CN.md @@ -10,32 +10,18 @@ ## 支持的版本 -- Android Oreo (8.x, sdk26/27) -- Android Pie (9, sdk28) -- Android Q (10, sdk29) -- Android R (11, sdk30) (实验性) +[Wiki: 支持的 Android 版本](https://github.com/ElderDrivers/EdXposed/wiki/%E5%8F%AF%E7%94%A8%E7%9A%84-Android-%E7%89%88%E6%9C%AC) -如果你使用 Android Nougat (7.x) 或更低版本, 请使用原版的 Xposed 框架 +## 构建 -## 编译需求 - -见 [Riru-Core 的编译需求](https://github.com/RikkaApps/Riru/blob/master/README.md#build-requirements) -zip 可执行文件可以在 [这里](http://gnuwin32.sourceforge.net/packages/zip.htm) 下载 - -## 编译和使用 - -1. 执行 `:edxp-core:[zip|push][Yahfa|Sandhook]Release` 来构建对应分支的可刷入的 zip 文件 -2. 在 `edxp-core/release/` 中找到可刷入的 zip 文件 -3. 经由 Magisk Manager 或在恢复模式(Recovery)中刷入 +[Wiki: 构建](https://github.com/ElderDrivers/EdXposed/wiki/%E6%9E%84%E5%BB%BA) ## 安装 -### 对于最新金丝雀构建，你需要Magisk v21+和Riru-Core v23+ - -1. 安装 Magisk v19+ (对于 华为 / 荣耀 或 一加 7T / 7TPro 设备, 需要 Magisk v20.2+) -2. 在 Magisk 仓库中安装 [Riru-Core](https://github.com/RikkaApps/Riru/releases) v19 或更高版本. +1. 安装 Magisk v21+ +2. 在 Magisk 仓库中安装 [Riru](https://github.com/RikkaApps/Riru/releases) v23 或更高版本. 3. [下载](#下载)并在恢复模式(Recovery)或经由 Magisk Manager 安装 EdXposed. -4. 安装 [框架管理应用](#框架管理应用). +4. 安装 [EdXposed Manager](https://github.com/ElderDrivers/EdXposedManager). 4. 重启手机. 5. 完成 :) @@ -52,35 +38,36 @@ Edxposed 拥有三个不同的版本 - Canary: 由 CI 自动生成的测试版. ***在 [[EdXposed Manager](https://github.com/ElderDrivers/EdXposedManager)] 中下载 Canary 版本*** -## 框架管理应用 - -> Xposed Installer 和 EdXposed Installer 均已停更，后续版本将取消支持，请使用 [EdXposed Manager](https://github.com/ElderDrivers/EdXposedManager) - -- 对于 v0.2.9.5 或更低版本: [Xposed Installer](https://github.com/DVDAndroid/XposedInstaller). -- 对于 v0.2.9.6 和 v0.2.9.7: [Xposed Installer](https://github.com/DVDAndroid/XposedInstaller) + [EdXp Manager](https://github.com/solohsu/EdXpManager)(optional). -- 对于 v0.2.9.8 或更高版本: [EdXposed Installer](https://github.com/solohsu/XposedInstaller) 或者 [EdXposed Manager](https://github.com/ElderDrivers/EdXposedManager). -- 对于最新版，我们建议使用 [EdXposed Manager](https://github.com/ElderDrivers/EdXposedManager). - ## 外部链接 - [List of Xposed Modules For Android Pie Working With EdXposed](https://forum.xda-developers.com/xposed/list-xposed-modules-android-pie-ed-t3892768) (感谢 Uraniam9 @ xda-developers) ## 已知问题 -见 [Wiki: 已知问题和漏洞](https://github.com/ElderDrivers/EdXposed/wiki/已知问题和漏洞) +见 [Issues](https://github.com/ElderDrivers/EdXposed/issues) ## 获取帮助 -- GitHub issues: [Issues](https://github.com/ElderDrivers/EdXposed/issues/) +- GitHub issues: [Issues](https://github.com/ElderDrivers/EdXposed/issues/new/choose) - 注意: 鉴于部分用户提交的Issues质量过低，对于中文用户反馈，请先阅读[EdXposed错误提交说明_cn](http://edxp.meowcat.org/assets/EdXposedIssuesReport_cn.txt)(不看说明提交的Issue会有很大可能被close) +## 模块开发者 + +欢迎开发者使用 EdXposed 框架编写 Xposed 模块。基于 EdXposed 框架编写的模块与原版的 Xposed 框架兼容，相反，基于原版 Xposed 框架的模块也能很好地与 EdXposed 框架一起工作。 + +- [Xposed 框架 API](https://api.xposed.info/) + +我们使用原版 Xposed 的模块仓库，因此您只需将模块上传至模块仓库，然后就可以在 EdXposed 中下载模块 + +- [Xposed 模块仓库](https://repo.xposed.info/) + ## 社区交流 - QQ 群组: [855219808](http://shang.qq.com/wpa/qunwpa?idkey=fae42a3dba9dc758caf63e971be2564e67bf7edd751a2ff1c750478b0ad1ca3f) - Telegram 电报: [@Code_of_MeowCat](http://t.me/Code_of_MeowCat) -注意: 这些社区群组不接收问题反馈, 请使用 [获取帮助](#获取帮助) 进行反馈. +注意: 这些社区群组不接受问题反馈, 请使用 [获取帮助](#获取帮助) 进行反馈. ## 贡献 diff --git a/edxp-core/.gitignore b/edxp-core/.gitignore index 9542b0dd4..7486ad911 100644 --- a/edxp-core/.gitignore +++ b/edxp-core/.gitignore @@ -4,6 +4,7 @@ /obj /release /template_override/module.prop +/template_override/en_US.sh /template_override/system /template_override/system_x86 /template_override/riru/module.prop.new diff --git a/edxp-core/template_override/post-fs-data.sh b/edxp-core/template_override/post-fs-data.sh index 2c0e115bd..78ca169f7 100644 --- a/edxp-core/template_override/post-fs-data.sh +++ b/edxp-core/template_override/post-fs-data.sh @@ -53,7 +53,7 @@ livePatch() { # PATH_PREFIX="${PATH_PREFIX_LEGACY}" #fi -DEFAULT_BASE_PATH="${PATH_PREFIX}${EDXP_MANAGER}" +#DEFAULT_BASE_PATH="${PATH_PREFIX}${EDXP_MANAGER}" MISC_PATH=$(cat /data/adb/edxp/misc_path) BASE_PATH="/data/misc/$MISC_PATH" diff --git a/edxp-core/tpl/edconfig.tpl b/edxp-core/tpl/edconfig.tpl index ae0632a59..e61bd7b3c 100644 --- a/edxp-core/tpl/edconfig.tpl +++ b/edxp-core/tpl/edconfig.tpl @@ -1,5 +1,5 @@ version=$apiCode-$version ($backend) arch=arm64 minsdk=26 -maxsdk=29 +maxsdk=30 requires:fbe_aware=1