From 9c0a5d6abc605ea4be8a2d150dad8eb594a7079f Mon Sep 17 00:00:00 2001
From: kotori0 <admin@0x.mk>
Date: Fri, 11 Dec 2020 17:14:54 +0800
Subject: [PATCH] Fix SandHook build

---
 build.gradle               |  2 +-
 edxp-core/build.gradle     |  2 --
 edxp-sandhook/build.gradle | 16 +++++++++-------
 edxp-yahfa/build.gradle    | 16 +++++++++++-----
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6ace8209..755b822c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ allprojects {
         templateLib64Path = templateRootPath + "/system/lib64/"
         templateEtcPath = templateRootPath + "/system/etc/"
         hiddenApiStubJarFilePath = project(":hiddenapi-stubs").buildDir.absolutePath + "/libs/framework-stub.jar"
-        zipPathMagiskReleasePath = project(":edxp-core").projectDir.path + "/build/tmp/release/magisk"
+        zipPathMagiskReleasePath = project(":edxp-core").projectDir.path + "/build/tmp/release/magisk/"
     }
     repositories {
         google()
diff --git a/edxp-core/build.gradle b/edxp-core/build.gradle
index e5a9205c..d24846e0 100644
--- a/edxp-core/build.gradle
+++ b/edxp-core/build.gradle
@@ -124,11 +124,9 @@ afterEvaluate {
             def authorList = property("${backendLowered}" + "_authors")
             def magiskModuleId = property("${backendLowered}" + "_module_id")
 
-            project.logger.lifecycle("delete file")
             delete file(zipPathMagiskReleasePath)
 
             def prepareJarsTask = task("prepareJars${backendCapped}${variantCapped}") {
-                project.logger.lifecycle("prepareJarsTask")
                 dependsOn cleanTemplate
                 dependsOn tasks.getByPath(":dexmaker:copyDex${variantCapped}")
                 dependsOn tasks.getByPath(":dalvikdx:copyDex${variantCapped}")
diff --git a/edxp-sandhook/build.gradle b/edxp-sandhook/build.gradle
index 93f34878..974a748c 100644
--- a/edxp-sandhook/build.gradle
+++ b/edxp-sandhook/build.gradle
@@ -59,19 +59,21 @@ afterEvaluate {
         def variantNameLowered = variant.name.toLowerCase()
         def myTemplatePath = "${projectDir}/template_override/"
 
-        task("copyDex${variantNameCapped}", type: Copy) {
+        task "copyDex${variantNameCapped}" {
             dependsOn "assemble${variantNameCapped}"
             dependsOn tasks.getByPath(":edxp-common:copyCommonProperties")
             dependsOn tasks.getByPath(":sandhook-hooklib:copySandHook${variantNameCapped}LibraryToMagiskTemplate")
             def dexOutPath = variant.name.contains("release") ?
                     "${buildDir}/intermediates/dex/${variantNameLowered}/minify${variantNameCapped}WithR8" :
                     "${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}"
-            from (dexOutPath){
-                rename("classes.dex", "edxp.dex")
-            }
-            destinationDir file(zipPathMagiskReleasePath + "/system/framework/")
-            outputs.upToDateWhen { false }
-            doLast {
+            doLast  {
+                project.logger.lifecycle("copyDex${variantNameCapped}")
+                copy {
+                    from(dexOutPath) {
+                        rename "classes.dex", "edxp.dex"
+                    }
+                    into myTemplatePath + "system/framework/"
+                }
                 copy {
                     from file(myTemplatePath)
                     into file(zipPathMagiskReleasePath)
diff --git a/edxp-yahfa/build.gradle b/edxp-yahfa/build.gradle
index d3c2aa20..7a7e1d8a 100644
--- a/edxp-yahfa/build.gradle
+++ b/edxp-yahfa/build.gradle
@@ -57,17 +57,23 @@ afterEvaluate {
         def variantNameCapped = variant.name.capitalize()
         def variantNameLowered = variant.name.toLowerCase()
 
-        task("copyDex${variantNameCapped}", type: Copy) {
+        task "copyDex${variantNameCapped}" {
             dependsOn "assemble${variantNameCapped}"
             dependsOn tasks.getByPath(":edxp-common:copyCommonProperties")
             def dexOutPath = variant.name.contains("release") ?
                     "${buildDir}/intermediates/dex/${variantNameLowered}/minify${variantNameCapped}WithR8" :
                     "${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}"
-            from (dexOutPath){
-                rename("classes.dex", "edxp.dex")
-            }
-            destinationDir file(templateRootPath + "system/framework/")
+
             outputs.upToDateWhen { false }
+            doLast {
+                project.logger.lifecycle("copyDex${variantNameCapped}")
+                copy {
+                    from (dexOutPath){
+                        rename("classes.dex", "edxp.dex")
+                    }
+                    into file(zipPathMagiskReleasePath + "/system/framework/")
+                }
+            }
         }
 
     }