Remove useless file

This commit is contained in:
Jim Wu 2020-01-06 20:12:55 +08:00
parent 611361540d
commit bf1467a068
2 changed files with 5 additions and 18 deletions

View File

@ -4,7 +4,6 @@
/obj /obj
/release /release
/template_override/module.prop /template_override/module.prop
/template_override/riru_module.prop
/template_override/system /template_override/system
/template_override/system_x86 /template_override/system_x86
*.iml *.iml

View File

@ -28,9 +28,9 @@ ext {
yahfa_module_id = "riru_edxposed" yahfa_module_id = "riru_edxposed"
sandhook_module_id = yahfa_module_id + "_sandhook" sandhook_module_id = yahfa_module_id + "_sandhook"
whale_module_id = yahfa_module_id + "_whale" whale_module_id = yahfa_module_id + "_whale"
yahfa_authors = "solohsu, rk700 & MlgmXyysd" yahfa_authors = "solohsu, MlgmXyysd & rk700"
sandhook_authors = "solohsu, ganyao114 & MlgmXyysd" sandhook_authors = "solohsu, MlgmXyysd & ganyao114"
whale_authors = "solohsu, asLody & MlgmXyysd" whale_authors = "solohsu, MlgmXyysd & asLody"
riruModuleId = "edxp" riruModuleId = "edxp"
zipPathMagiskRelease = "$buildDir/tmp/release/magisk" zipPathMagiskRelease = "$buildDir/tmp/release/magisk"
@ -148,11 +148,6 @@ afterEvaluate {
versionCode: "$versionCode", authorList: "$authorList") versionCode: "$versionCode", authorList: "$authorList")
filter(FixCrLfFilter.class, eol: FixCrLfFilter.CrLf.newInstance("lf")) filter(FixCrLfFilter.class, eol: FixCrLfFilter.CrLf.newInstance("lf"))
} }
copy {
from "${templateRootPath}/module.prop"
into templateRootPath
rename "module.prop", "riru_module.prop"
}
} }
def libPathRelease = "${buildDir}/intermediates/cmake/${variantLowered}/obj" def libPathRelease = "${buildDir}/intermediates/cmake/${variantLowered}/obj"
doLast { doLast {
@ -169,10 +164,6 @@ afterEvaluate {
.replaceAll('%BACKEND%', "$backendCapped") } .replaceAll('%BACKEND%', "$backendCapped") }
filter(FixCrLfFilter.class, eol: FixCrLfFilter.CrLf.newInstance("lf")) filter(FixCrLfFilter.class, eol: FixCrLfFilter.CrLf.newInstance("lf"))
} }
copy {
from 'template_override/riru_module.prop'
into "$zipPathMagiskRelease/data/misc/riru/modules/${riruModuleId}"
}
copy { copy {
from "$libPathRelease/armeabi-v7a" from "$libPathRelease/armeabi-v7a"
into "$zipPathMagiskRelease/system/lib" into "$zipPathMagiskRelease/system/lib"
@ -189,15 +180,12 @@ afterEvaluate {
from "$libPathRelease/x86_64" from "$libPathRelease/x86_64"
into "$zipPathMagiskRelease/system_x86/lib64" into "$zipPathMagiskRelease/system_x86/lib64"
} }
file("$zipPathMagiskRelease/riru_module.prop").delete()
file("$zipPathMagiskRelease/data/misc/riru/modules/${riruModuleId}/riru_module.prop").renameTo("$zipPathMagiskRelease/data/misc/riru/modules/${riruModuleId}/module.prop")
} }
} }
def zipTask = task("zip${backendCapped}${variantCapped}", type: Zip) { def zipTask = task("zip${backendCapped}${variantCapped}", type: Zip) {
dependsOn prepareMagiskFilesTask dependsOn prepareMagiskFilesTask
archiveName "magisk-${module_name}-${backend}-${project.version}-${variantLowered}.zip" archiveName "${module_name}-${backend}-${project.version}-${variantLowered}.zip"
destinationDir file("$projectDir/release") destinationDir file("$projectDir/release")
from "$zipPathMagiskRelease" from "$zipPathMagiskRelease"
} }
@ -206,7 +194,7 @@ afterEvaluate {
dependsOn zipTask dependsOn zipTask
workingDir "${projectDir}/release" workingDir "${projectDir}/release"
def commands = ["adb", "push", def commands = ["adb", "push",
"magisk-${module_name}-${backend}-${project.version}-${variantLowered}.zip", "${module_name}-${backend}-${project.version}-${variantLowered}.zip",
"/sdcard/"] "/sdcard/"]
if (is_windows) { if (is_windows) {
commandLine 'cmd', '/c', commands.join(" ") commandLine 'cmd', '/c', commands.join(" ")