Clean template_override directory before build

build.gradle

@@ -18,7 +18,12 @@ buildscript {
 allprojects {
     ext {
         templateRootPath = project(":edxp-core").projectDir.path + "/template_override/"
+        templateSystemPath = templateRootPath + "/system/"
+        templateSystemx86Path = templateRootPath + "/system_x86/"
         templateFrameworkPath = templateRootPath + "/system/framework/"
+        templateLibPath = templateRootPath + "/system/lib/"
+        templateLib64Path = templateRootPath + "/system/lib64/"
+        templateEtcPath = templateRootPath + "/system/etc/"
     }
     repositories {
         google()

edxp-core/.gitignore

@@ -3,5 +3,6 @@
 /libs
 /obj
 /release
-/template_override/system/framework/edxp.jar
+/template_override/system
+/template_override/system_x86
 *.iml

edxp-core/build.gradle

@@ -59,6 +59,10 @@ task copyDexmakerJar {
     }
 }
 
+task cleanTemplate(type: Delete) {
+    delete file(templateSystemPath), file(templateSystemx86Path)
+}
+
 afterEvaluate {
 
     android.libraryVariants.all { variant ->
@@ -72,7 +76,7 @@ afterEvaluate {
             def backendLowered = backend.toLowerCase()
 
             def zipTask = task("zip${backendCapped}${variantCapped}", type: Exec) {
-                dependsOn copyDalvikdxJar, copyDexmakerJar
+                dependsOn cleanTemplate, copyDalvikdxJar, copyDexmakerJar
                 dependsOn tasks.getByPath(":edxp-${backendLowered}:makeAndCopy${variantCapped}")
                 workingDir '..'
                 commandLine 'sh', 'build.sh', project.name,

edxp-sandhook/.gitignore

@@ -1 +1,2 @@
 /build
+/template_override/system/framework/edxp.jar

edxp-sandhook/build.gradle

@@ -54,10 +54,19 @@ afterEvaluate {
         def variantNameCapped = variant.name.capitalize()
         def variantNameLowered = variant.name.toLowerCase()
 
+        def myTemplatePath = "${projectDir}/template_override/"
+
         task("makeAndCopy${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") {
             from "${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}/out/"
-            destinationDir file(templateFrameworkPath)
+            destinationDir file(myTemplatePath + "system/framework/")
             baseName "edxp"
+            doLast {
+                copy {
+                    from file(myTemplatePath)
+                    into file(templateRootPath)
+                }
+            }
+            outputs.upToDateWhen { false }
         }
     }
 }

edxp-sandhook/template_override/system/etc/public.libraries-edxp.txt

@@ -1,2 +1 @@
 libsandhook.edxp.so
-libwhale.edxp.so

edxp-sandhook/template_override/system/framework/edconfig.jar

@@ -0,0 +1,5 @@
+version=90.0-sandhook-0.3.1.6-beta-SNAPSHOT
+arch=arm64
+minsdk=23
+maxsdk=28
+requires:fbe_aware=1

edxp-whale/.gitignore

@@ -1 +1,2 @@
 /build
+/template_override/system/framework/edxp.jar

edxp-whale/build.gradle

@@ -52,10 +52,19 @@ afterEvaluate {
         def variantNameCapped = variant.name.capitalize()
         def variantNameLowered = variant.name.toLowerCase()
 
+        def myTemplatePath = "${projectDir}/template_override/"
+
         task("makeAndCopy${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") {
             from "${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}/out/"
-            destinationDir file(templateFrameworkPath)
+            destinationDir file(myTemplatePath + "system/framework/")
             baseName "edxp"
+            doLast {
+                copy {
+                    from file(myTemplatePath)
+                    into file(templateRootPath)
+                }
+            }
+            outputs.upToDateWhen { false }
         }
     }
 }

edxp-whale/template_override/system/etc/public.libraries-edxp.txt

@@ -0,0 +1 @@
+libwhale.edxp.so

edxp-whale/template_override/system/framework/edconfig.jar

@@ -1,4 +1,4 @@
-version=90.0-0.3.1.6-beta-SNAPSHOT
+version=90.0-0.3.1.6-whale-beta-SNAPSHOT
 arch=arm64
 minsdk=23
 maxsdk=28

edxp-yahfa/.gitignore

@@ -1 +1,2 @@
 /build
+/template_override/system/framework/edxp.jar

edxp-yahfa/build.gradle

@@ -53,10 +53,19 @@ afterEvaluate {
         def variantNameCapped = variant.name.capitalize()
         def variantNameLowered = variant.name.toLowerCase()
 
+        def myTemplatePath = "${projectDir}/template_override/"
+
         task("makeAndCopy${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") {
             from "${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}/out/"
-            destinationDir file(templateFrameworkPath)
+            destinationDir file(myTemplatePath + "system/framework/")
             baseName "edxp"
+            doLast {
+                copy {
+                    from file(myTemplatePath)
+                    into file(templateRootPath)
+                }
+            }
+            outputs.upToDateWhen { false }
         }
     }
 }

edxp-yahfa/template_override/system/framework/edconfig.jar

@@ -0,0 +1,5 @@
+version=90.0-yahfa-0.3.1.6-beta-SNAPSHOT
+arch=arm64
+minsdk=23
+maxsdk=28
+requires:fbe_aware=1