Skip to content

Commit 0ffff4b

Browse files
MlgmXyysdMlgmXyysd
committed
Merge SandHook and YAHFA into one zip
1 parent c75907b commit 0ffff4b

File tree

10 files changed

+154
-217
lines changed

10 files changed

+154
-217
lines changed

‎appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '0.5.1.4_{build}-{branch}'
1+
version: '0.5.2.0_{build}-{branch}'
22

33
environment:
44
ANDROID_HOME: C:\android-sdk-windows

‎edxp-core/build.gradle

+111-128
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ apply plugin: 'com.android.library'
88
static def calcSha256(file) {
99
def md = MessageDigest.getInstance("SHA-256")
1010
file.eachByte 4096, { bytes, size ->
11-
md.update(bytes, 0, size);
11+
md.update(bytes, 0, size)
1212
}
1313
return md.digest().encodeHex()
1414
}
1515

1616
// Values set here will be overriden by AppVeyor, feel free to modify during development.
17-
def buildVersionName = 'v0.5.1.4'
17+
def buildVersionName = 'v0.5.2.0'
1818
def buildVersionCode = 233
1919

2020
if (System.env.APPVEYOR_BUILD_VERSION != null) {
@@ -34,11 +34,8 @@ ext {
3434
module_name = "EdXposed"
3535
jar_dest_dir = "${projectDir}/template_override/system/framework/"
3636
is_windows = OperatingSystem.current().isWindows()
37-
backends = ["YAHFA", "SandHook"]
38-
yahfa_module_id = "riru_edxposed"
39-
sandhook_module_id = yahfa_module_id + "_sandhook"
40-
yahfa_authors = "solohsu, MlgmXyysd & rk700"
41-
sandhook_authors = "solohsu, MlgmXyysd & ganyao114"
37+
module_id = "riru_edxposed"
38+
authors = "solohsu, MlgmXyysd"
4239

4340
riruModuleId = "edxp"
4441

@@ -118,140 +115,126 @@ afterEvaluate {
118115
def variantCapped = variant.name.capitalize()
119116
def variantLowered = variant.name.toLowerCase()
120117

121-
backends.each { backend ->
122-
def backendLowered = backend.toLowerCase()
123-
def backendCapped = backendLowered.capitalize()
124-
def authorList = property("${backendLowered}" + "_authors")
125-
def magiskModuleId = property("${backendLowered}" + "_module_id")
118+
delete file(zipPathMagiskReleasePath)
126119

127-
delete file(zipPathMagiskReleasePath)
120+
def prepareJarsTask = task("prepareJars${variantCapped}") {
121+
dependsOn cleanTemplate
122+
dependsOn tasks.getByPath(":dexmaker:copyDex${variantCapped}")
123+
dependsOn tasks.getByPath(":dalvikdx:copyDex${variantCapped}")
124+
dependsOn tasks.getByPath(":edxp-service:copyDex${variantCapped}")
125+
dependsOn tasks.getByPath(":edxp-yahfa:copyDex${variantCapped}")
126+
dependsOn tasks.getByPath(":edxp-sandhook:copyDex${variantCapped}")
127+
}
128128

129-
def prepareJarsTask = task("prepareJars${backendCapped}${variantCapped}") {
130-
dependsOn cleanTemplate
131-
dependsOn tasks.getByPath(":dexmaker:copyDex${variantCapped}")
132-
dependsOn tasks.getByPath(":dalvikdx:copyDex${variantCapped}")
133-
dependsOn tasks.getByPath(":edxp-service:copyDex${variantCapped}")
134-
dependsOn tasks.getByPath(":edxp-${backendLowered}:copyDex${variantCapped}")
129+
def prepareMagiskFilesTask = task("prepareMagiskFiles${variantCapped}", type: Delete) {
130+
dependsOn prepareJarsTask, "assemble${variantCapped}"
131+
doFirst {
132+
copy {
133+
from "${projectDir}/tpl/edconfig.tpl"
134+
into templateFrameworkPath
135+
rename "edconfig.tpl", "edconfig.jar"
136+
expand(version: "$version", apiCode: "$apiCode")
137+
}
138+
copy {
139+
from "${projectDir}/tpl/module.prop.tpl"
140+
into templateRootPath
141+
rename "module.prop.tpl", "module.prop"
142+
expand(moduleId: module_id,
143+
versionName: "$version",
144+
versionCode: "$versionCode", authorList: authors,
145+
apiCode: "$apiCode", minApi: "$moduleMinRiruApiVersion")
146+
filter(FixCrLfFilter.class, eol: FixCrLfFilter.CrLf.newInstance("lf"))
147+
}
135148
}
136-
137-
def prepareMagiskFilesTask = task("prepareMagiskFiles${backendCapped}${variantCapped}", type: Delete) {
138-
dependsOn prepareJarsTask, "assemble${variantCapped}"
139-
doFirst {
140-
copy {
141-
from "${projectDir}/tpl/edconfig.tpl"
142-
into templateFrameworkPath
143-
rename "edconfig.tpl", "edconfig.jar"
144-
expand(version: "$version", backend: "$backend", apiCode: "$apiCode")
145-
}
146-
copy {
147-
from "${projectDir}/tpl/module.prop.tpl"
148-
into templateRootPath
149-
rename "module.prop.tpl", "module.prop"
150-
expand(moduleId: "$magiskModuleId", backend: "$backendCapped",
151-
versionName: "$version" + " ($backend)",
152-
versionCode: "$versionCode", authorList: "$authorList",
153-
apiCode: "$apiCode", minApi: "$moduleMinRiruApiVersion")
154-
filter(FixCrLfFilter.class, eol: FixCrLfFilter.CrLf.newInstance("lf"))
155-
}
149+
def libPathRelease = "${buildDir}/intermediates/cmake/${variantLowered}/obj"
150+
def exclude_list = ["riru.sh"]
151+
doLast {
152+
copy {
153+
from "${projectDir}/template_override"
154+
into zipPathMagiskReleasePath
155+
exclude exclude_list
156156
}
157-
def libPathRelease = "${buildDir}/intermediates/cmake/${variantLowered}/obj"
158-
def exclude_list = ["riru.sh"]
159-
doLast {
160-
copy {
161-
from "${projectDir}/template_override"
162-
into zipPathMagiskReleasePath
163-
exclude exclude_list
164-
}
165-
copy {
166-
from "${projectDir}/template_override"
167-
into zipPathMagiskReleasePath
168-
include 'util_functions.sh'
169-
filter { line ->
170-
line.replaceAll('%%%RIRU_MODULE_ID%%%', riruModuleId)
171-
.replaceAll('%%%RIRU_MIN_API_VERSION%%%', moduleMinRiruApiVersion.toString())
172-
.replaceAll('%%%RIRU_MIN_VERSION_NAME%%%', moduleMinRiruVersionName)
173-
}
174-
filter(FixCrLfFilter.class,
175-
eol: FixCrLfFilter.CrLf.newInstance("lf"))
176-
}
177-
copy {
178-
include "libriru_edxp.so"
179-
from "$libPathRelease/armeabi-v7a"
180-
into "$zipPathMagiskReleasePath/system/lib"
181-
}
182-
copy {
183-
include "libriru_edxp.so"
184-
from "$libPathRelease/arm64-v8a"
185-
into "$zipPathMagiskReleasePath/system/lib64"
186-
}
187-
copy {
188-
include "libriru_edxp.so"
189-
from "$libPathRelease/x86"
190-
into "$zipPathMagiskReleasePath/system_x86/lib"
191-
}
192-
copy {
193-
include "libriru_edxp.so"
194-
from "$libPathRelease/x86_64"
195-
into "$zipPathMagiskReleasePath/system_x86/lib64"
196-
}
197-
// generate sha1sum
198-
fileTree(zipPathMagiskReleasePath).matching {
199-
exclude "README.md", "META-INF"
200-
}.visit { f ->
201-
if (f.directory) return
202-
file(f.file.path + ".s").text = calcSha256(f.file)
157+
copy {
158+
from "${projectDir}/template_override"
159+
into zipPathMagiskReleasePath
160+
include 'util_functions.sh'
161+
filter { line ->
162+
line.replaceAll('%%%RIRU_MODULE_ID%%%', riruModuleId)
163+
.replaceAll('%%%RIRU_MIN_API_VERSION%%%', moduleMinRiruApiVersion.toString())
164+
.replaceAll('%%%RIRU_MIN_VERSION_NAME%%%', moduleMinRiruVersionName)
203165
}
166+
filter(FixCrLfFilter.class,
167+
eol: FixCrLfFilter.CrLf.newInstance("lf"))
204168
}
205-
}
206-
207-
def zipTask = task("zip${backendCapped}${variantCapped}", type: Zip) {
208-
dependsOn prepareMagiskFilesTask
209-
archiveName "${module_name}-${backend}-${project.version}-${variantLowered}.zip"
210-
destinationDir file("$projectDir/release")
211-
from "$zipPathMagiskReleasePath"
212-
}
213-
214-
task("push${backendCapped}${variantCapped}", type: Exec) {
215-
dependsOn zipTask
216-
workingDir "${projectDir}/release"
217-
def commands = [android.adbExecutable, "push",
218-
"${module_name}-${backend}-${project.version}-${variantLowered}.zip",
219-
"/data/local/tmp/"]
220-
if (is_windows) {
221-
commandLine 'cmd', '/c', commands.join(" ")
222-
} else {
223-
commandLine commands
169+
copy {
170+
include "libriru_edxp.so"
171+
from "$libPathRelease/armeabi-v7a"
172+
into "$zipPathMagiskReleasePath/system/lib"
224173
}
225-
}
226-
task("flash${backendCapped}${variantCapped}", type: Exec) {
227-
dependsOn tasks.getByPath("push${backendCapped}${variantCapped}")
228-
workingDir "${projectDir}/release"
229-
def commands = [android.adbExecutable, "shell", "su", "-c",
230-
"magisk --install-module /data/local/tmp/${module_name}-${backend}-${project.version}-${variantLowered}.zip"]
231-
if (is_windows) {
232-
commandLine 'cmd', '/c', commands.join(" ")
233-
} else {
234-
commandLine commands
174+
copy {
175+
include "libriru_edxp.so"
176+
from "$libPathRelease/arm64-v8a"
177+
into "$zipPathMagiskReleasePath/system/lib64"
235178
}
236-
}
237-
task("flashAndReboot${backendCapped}${variantCapped}", type: Exec) {
238-
dependsOn tasks.getByPath("flash${backendCapped}${variantCapped}")
239-
workingDir "${projectDir}/release"
240-
def commands = [android.adbExecutable, "shell", "reboot"]
241-
if (is_windows) {
242-
commandLine 'cmd', '/c', commands.join(" ")
243-
} else {
244-
commandLine commands
179+
copy {
180+
include "libriru_edxp.so"
181+
from "$libPathRelease/x86"
182+
into "$zipPathMagiskReleasePath/system_x86/lib"
183+
}
184+
copy {
185+
include "libriru_edxp.so"
186+
from "$libPathRelease/x86_64"
187+
into "$zipPathMagiskReleasePath/system_x86/lib64"
188+
}
189+
// generate sha1sum
190+
fileTree(zipPathMagiskReleasePath).matching {
191+
exclude "README.md", "META-INF"
192+
}.visit { f ->
193+
if (f.directory) return
194+
file(f.file.path + ".s").text = calcSha256(f.file)
245195
}
246196
}
247197
}
248198

249-
// backward compatible
250-
task("zip${variantCapped}") {
251-
dependsOn "zipYahfa${variantCapped}"
199+
def zipTask = task("zip${variantCapped}", type: Zip) {
200+
dependsOn prepareMagiskFilesTask
201+
archiveName "${module_name}-${project.version}-${variantLowered}.zip"
202+
destinationDir file("$projectDir/release")
203+
from "$zipPathMagiskReleasePath"
252204
}
253-
task("push${variantCapped}") {
254-
dependsOn "pushYahfa${variantCapped}"
205+
206+
task("push${variantCapped}", type: Exec) {
207+
dependsOn zipTask
208+
workingDir "${projectDir}/release"
209+
def commands = [android.adbExecutable, "push",
210+
"${module_name}-${project.version}-${variantLowered}.zip",
211+
"/data/local/tmp/"]
212+
if (is_windows) {
213+
commandLine 'cmd', '/c', commands.join(" ")
214+
} else {
215+
commandLine commands
216+
}
217+
}
218+
task("flash${variantCapped}", type: Exec) {
219+
dependsOn tasks.getByPath("push${variantCapped}")
220+
workingDir "${projectDir}/release"
221+
def commands = [android.adbExecutable, "shell", "su", "-c",
222+
"magisk --install-module /data/local/tmp/${module_name}-${project.version}-${variantLowered}.zip"]
223+
if (is_windows) {
224+
commandLine 'cmd', '/c', commands.join(" ")
225+
} else {
226+
commandLine commands
227+
}
228+
}
229+
task("flashAndReboot${variantCapped}", type: Exec) {
230+
dependsOn tasks.getByPath("flash${variantCapped}")
231+
workingDir "${projectDir}/release"
232+
def commands = [android.adbExecutable, "shell", "reboot"]
233+
if (is_windows) {
234+
commandLine 'cmd', '/c', commands.join(" ")
235+
} else {
236+
commandLine commands
237+
}
255238
}
256239
}
257240

‎edxp-core/template_override/customize.sh

+18-25
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,10 @@ LANG_UTIL_ERR_RIRU_NOT_FOUND_1="is not installed"
9090
LANG_UTIL_ERR_RIRU_NOT_FOUND_2="Please install Riru from Magisk Manager"
9191
LANG_UTIL_ERR_RIRU_LOW_1="or above is required"
9292
LANG_UTIL_ERR_RIRU_LOW_2="Please upgrade Riru from Magisk Manager"
93-
LANG_UTIL_ERR_REQUIRE_YAHFA_1="Architecture x86 or x86_64 detected"
94-
LANG_UTIL_ERR_REQUIRE_YAHFA_2="Only YAHFA variant supports x86 or x86_64 architecture devices"
95-
LANG_UTIL_ERR_REQUIRE_YAHFA_3="You can download from 'Magisk Manager' or 'EdXposed Manager'"
9693
LANG_UTIL_ERR_ANDROID_UNSUPPORT_1="Unsupported Android version"
9794
LANG_UTIL_ERR_ANDROID_UNSUPPORT_2="(below Oreo)"
9895
LANG_UTIL_ERR_ANDROID_UNSUPPORT_3="Learn more from our GitHub Wiki"
9996
LANG_UTIL_ERR_PLATFORM_UNSUPPORT="Unsupported platform"
100-
LANG_UTIL_ERR_DUPINST_1="Duplicate installation is now allowed"
101-
LANG_UTIL_ERR_DUPINST_2="Remove"
102-
LANG_UTIL_ERR_DUPINST_3="and reboot to install again"
10397

10498
# Load lang
10599
if [[ ${BOOTMODE} == true ]]; then
@@ -136,6 +130,9 @@ edxp_check_architecture
136130
ui_print "- ${LANG_CUST_INST_EXT_FILES}"
137131

138132
# extract module files
133+
rm -rf "${MODPATH}/../../${MODULES_PATH}/riru_edxposed_sandhook"
134+
mkdir -p /data/adb/edxp || abortC "! ${LANG_CUST_ERR_CONF_CREATE}"
135+
139136
extract "${ZIPFILE}" 'EdXposed.apk' "${MODPATH}"
140137
extract "${ZIPFILE}" 'module.prop' "${MODPATH}"
141138
extract "${ZIPFILE}" 'system.prop' "${MODPATH}"
@@ -147,7 +144,8 @@ extract "${ZIPFILE}" 'system/framework/edconfig.jar' "${MODPATH}"
147144
extract "${ZIPFILE}" 'system/framework/eddalvikdx.dex' "${MODPATH}"
148145
extract "${ZIPFILE}" 'system/framework/eddexmaker.dex' "${MODPATH}"
149146
extract "${ZIPFILE}" 'system/framework/edservice.dex' "${MODPATH}"
150-
extract "${ZIPFILE}" 'system/framework/edxp.dex' "${MODPATH}"
147+
extract "${ZIPFILE}" 'system/framework/sandhook.dex' "/data/adb/edxp" true
148+
extract "${ZIPFILE}" 'system/framework/yahfa.dex' "/data/adb/edxp" true
151149

152150
if [ "$ARCH" = "x86" ] || [ "$ARCH" = "x64" ]; then
153151
ui_print "- ${LANG_CUST_INST_EXT_LIB_X86}"
@@ -162,16 +160,12 @@ if [ "$ARCH" = "x86" ] || [ "$ARCH" = "x64" ]; then
162160
else
163161
ui_print "- ${LANG_CUST_INST_EXT_LIB_ARM}"
164162
extract "$ZIPFILE" 'system/lib/libriru_edxp.so' "${MODPATH}"
165-
if [[ "${VARIANT}" == "SandHook" ]]; then
166-
extract "$ZIPFILE" 'system/lib/libsandhook.edxp.so' "${MODPATH}"
167-
fi
163+
extract "$ZIPFILE" 'system/lib/libsandhook.edxp.so' "${MODPATH}"
168164

169165
if [ "$IS64BIT" = true ]; then
170166
ui_print "- ${LANG_CUST_INST_EXT_LIB_ARM64}"
171167
extract "$ZIPFILE" 'system/lib64/libriru_edxp.so' "${MODPATH}"
172-
if [[ "${VARIANT}" == "SandHook" ]]; then
173-
extract "$ZIPFILE" 'system/lib64/libsandhook.edxp.so' "${MODPATH}"
174-
fi
168+
extract "$ZIPFILE" 'system/lib64/libsandhook.edxp.so' "${MODPATH}"
175169
fi
176170
fi
177171

@@ -181,7 +175,7 @@ fi
181175

182176
if [[ ${BOOTMODE} == true && ${NO_MANAGER} == true ]]; then
183177
ui_print "- ${LANG_CUST_INST_STUB}"
184-
cp "${MODPATH}/EdXposed.apk" "/data/local/tmp/EdXposed.apk"
178+
cp -f "${MODPATH}/EdXposed.apk" "/data/local/tmp/EdXposed.apk"
185179
LOCAL_PATH_INFO=$(ls -ldZ "/data/local/tmp")
186180
LOCAL_PATH_OWNER=$(echo "${LOCAL_PATH_INFO}" | awk -F " " '{print $3":"$4}')
187181
LOCAL_PATH_CONTEXT=$(echo "${LOCAL_PATH_INFO}" | awk -F " " '{print $5}')
@@ -199,7 +193,6 @@ else
199193
MISC_RAND=$(tr -cd 'A-Za-z0-9' < /dev/urandom | head -c16)
200194
MISC_PATH="edxp_${MISC_RAND}"
201195
ui_print " - ${LANG_CUST_INST_CONF_NEW} ${MISC_RAND}"
202-
mkdir -p /data/adb/edxp || abortC "! ${LANG_CUST_ERR_CONF_CREATE}"
203196
echo "$MISC_PATH" > /data/adb/edxp/misc_path || abortC "! ${LANG_CUST_ERR_CONF_STORE}"
204197
if [[ -d /data/user_de/0/org.meowcat.edxposed.manager/conf/ ]]; then
205198
mkdir -p /data/misc/$MISC_PATH/0/conf
@@ -211,21 +204,23 @@ touch /data/adb/edxp/new_install || abortC "! ${LANG_CUST_ERR_CONF_FIRST}"
211204
set_perm_recursive /data/adb/edxp root root 0700 0600 "u:object_r:magisk_file:s0" || abortC "! ${LANG_CUST_ERR_PERM}"
212205
mkdir -p /data/misc/$MISC_PATH || abortC "! ${LANG_CUST_ERR_CONF_CREATE}"
213206
set_perm /data/misc/$MISC_PATH root root 0771 "u:object_r:magisk_file:s0" || abortC "! ${LANG_CUST_ERR_PERM}"
214-
echo "[[ -f /data/adb/edxp/keep_data ]] || rm -rf /data/misc/$MISC_PATH" >> "${MODPATH}/uninstall.sh" || abortC "! ${LANG_CUST_ERR_CONF_UNINST}"
207+
echo "rm -rf /data/misc/$MISC_PATH" >> "${MODPATH}/uninstall.sh" || abortC "! ${LANG_CUST_ERR_CONF_UNINST}"
215208
echo "[[ -f /data/adb/edxp/new_install ]] || rm -rf /data/adb/edxp" >> "${MODPATH}/uninstall.sh" || abortC "! ${LANG_CUST_ERR_CONF_UNINST}"
216209

210+
if [[ "${ARCH}" == "x86" || "${ARCH}" == "x64" ]]; then
211+
touch /data/misc/$MISC_PATH/0/conf/disable_sandhook || abortC "! ${LANG_CUST_ERR_CONF_CREATE}"
212+
fi
213+
217214
ui_print "- ${LANG_CUST_INST_COPY_LIB}"
218215

219216
rm -rf "/data/misc/$MISC_PATH/framework"
220217
mv "${MODPATH}/system/framework" "/data/misc/$MISC_PATH/framework"
221218

222-
if [[ "${VARIANT}" == "SandHook" ]]; then
223-
mkdir -p "/data/misc/$MISC_PATH/framework/lib"
224-
mv "${MODPATH}/system/lib/libsandhook.edxp.so" "/data/misc/$MISC_PATH/framework/lib/libsandhook.edxp.so"
225-
if [ "$IS64BIT" = true ]; then
226-
mkdir -p "/data/misc/$MISC_PATH/framework/lib64"
227-
mv "${MODPATH}/system/lib64/libsandhook.edxp.so" "/data/misc/$MISC_PATH/framework/lib64/libsandhook.edxp.so"
228-
fi
219+
mkdir -p "/data/misc/$MISC_PATH/framework/lib"
220+
mv "${MODPATH}/system/lib/libsandhook.edxp.so" "/data/misc/$MISC_PATH/framework/lib/libsandhook.edxp.so"
221+
if [ "$IS64BIT" = true ]; then
222+
mkdir -p "/data/misc/$MISC_PATH/framework/lib64"
223+
mv "${MODPATH}/system/lib64/libsandhook.edxp.so" "/data/misc/$MISC_PATH/framework/lib64/libsandhook.edxp.so"
229224
fi
230225
set_perm_recursive /data/misc/$MISC_PATH/framework root root 0755 0644 "u:object_r:magisk_file:s0" || abortC "! ${LANG_CUST_ERR_PERM}"
231226

@@ -262,8 +257,6 @@ cp "${MODPATH}/module.prop" "${RIRU_TARGET}/module.prop" || abortC "! ${LANG_CUS
262257

263258
set_perm "$RIRU_TARGET/module.prop" 0 0 0600 $RIRU_SECONTEXT || abortC "! ${LANG_CUST_ERR_PERM}"
264259

265-
rm -f /data/adb/edxp/keep_data
266-
267260
set_perm_recursive "${MODPATH}" 0 0 0755 0644
268261
ui_print "- ${LANG_CUST_INST_DONE} EdXposed ${VERSION}!"
269262

0 commit comments

Comments
 (0)