From 346254f50b5dc18000a9cfb728d93c5c530cbcfb Mon Sep 17 00:00:00 2001 From: solohsu Date: Thu, 21 Mar 2019 23:48:01 +0800 Subject: [PATCH] Generate edconfig for each backend --- edxp-core/build.gradle | 10 +++++++++- .../framework/edconfig.jar => edxp-core/edconfig.tpl | 2 +- .../template_override/system/framework/edconfig.jar | 5 ----- .../template_override/system/framework/edconfig.jar | 5 ----- 4 files changed, 10 insertions(+), 12 deletions(-) rename edxp-sandhook/template_override/system/framework/edconfig.jar => edxp-core/edconfig.tpl (53%) delete mode 100644 edxp-whale/template_override/system/framework/edconfig.jar delete mode 100644 edxp-yahfa/template_override/system/framework/edconfig.jar diff --git a/edxp-core/build.gradle b/edxp-core/build.gradle index b8027f91..227f4971 100644 --- a/edxp-core/build.gradle +++ b/edxp-core/build.gradle @@ -81,11 +81,19 @@ afterEvaluate { workingDir '..' commandLine 'sh', 'build.sh', project.name, "${backendLowered}-${project.version}-${variantLowered}", "${module_name}" + doFirst { + copy { + from "${projectDir}/edconfig.tpl" + into templateFrameworkPath + rename "edconfig.tpl", "edconfig.jar" + expand(backend: "$backendCapped") + } + } } task("push${backendCapped}${variantCapped}", type: Exec) { dependsOn zipTask - workingDir 'release' + workingDir "${projectDir}/release" def commands = ["adb", "push", "magisk-${module_name}-${backendLowered}-${project.version}-${variantLowered}.zip", "/sdcard/"] diff --git a/edxp-sandhook/template_override/system/framework/edconfig.jar b/edxp-core/edconfig.tpl similarity index 53% rename from edxp-sandhook/template_override/system/framework/edconfig.jar rename to edxp-core/edconfig.tpl index c05f83e5..23614af1 100644 --- a/edxp-sandhook/template_override/system/framework/edconfig.jar +++ b/edxp-core/edconfig.tpl @@ -1,4 +1,4 @@ -version=90.0-sandhook-0.3.1.6-beta-SNAPSHOT +version=90.0-0.3.1.6-beta-SNAPSHOT ($backend) arch=arm64 minsdk=23 maxsdk=28 diff --git a/edxp-whale/template_override/system/framework/edconfig.jar b/edxp-whale/template_override/system/framework/edconfig.jar deleted file mode 100644 index 8823ba2c..00000000 --- a/edxp-whale/template_override/system/framework/edconfig.jar +++ /dev/null @@ -1,5 +0,0 @@ -version=90.0-0.3.1.6-whale-beta-SNAPSHOT -arch=arm64 -minsdk=23 -maxsdk=28 -requires:fbe_aware=1 diff --git a/edxp-yahfa/template_override/system/framework/edconfig.jar b/edxp-yahfa/template_override/system/framework/edconfig.jar deleted file mode 100644 index 52afb4a1..00000000 --- a/edxp-yahfa/template_override/system/framework/edconfig.jar +++ /dev/null @@ -1,5 +0,0 @@ -version=90.0-yahfa-0.3.1.6-beta-SNAPSHOT -arch=arm64 -minsdk=23 -maxsdk=28 -requires:fbe_aware=1