From 42285245d5eda94c12fa52c3d943739f1efe5bc1 Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Sat, 6 Oct 2018 00:43:19 -0300
Subject: [PATCH] Fix gradle script

---
 android/app/build.gradle |  2 +-
 android/build.gradle     | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 13d3a0fc41..76f5acfaea 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -83,7 +83,7 @@ android {
                 def renameHifiACTask = rootProject.getTasksByName("renameHifiACTask${variant.name.capitalize()}", false).first()
                 runDumpSymsTask.dependsOn(task)
                 variant.assemble.dependsOn(uploadDumpSymsTask)
-                variant.assemble.dependsOn(renameHifiACTask)
+                variant.mergeResources.dependsOn(renameHifiACTask)
             }
         }
 
diff --git a/android/build.gradle b/android/build.gradle
index 72015aab2e..14f9e4803f 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -670,17 +670,15 @@ task uploadBreakpadDumpSymsRelease(type:io.github.httpbuilderng.http.HttpTask, d
 task renameHifiACTaskDebug() {
     doLast {
         def sourceFile = new File("${appDir}/build/intermediates/cmake/debug/obj/arm64-v8a/","libhifiCodec.so")
-        def destinationFile = new File("${appDir}/src/main/jniLibs/", "libplugins_libhifiCodec.so)")
+        def destinationFile = new File("${appDir}/src/main/jniLibs/arm64-v8a", "libplugins_libhifiCodec.so")
         copy { from sourceFile;  into destinationFile.parent;  rename(sourceFile.name, destinationFile.name) }
     }
 }
 task renameHifiACTaskRelease(type: Copy) {
     doLast {
-        doLast {
-            def sourceFile = new File("${appDir}/build/intermediates/cmake/release/obj/arm64-v8a/","libhifiCodec.so")
-            def destinationFile = new File("${appDir}/src/main/jniLibs/arm64-v8a", "libplugins_libhifiCodec.so")
-            copy { from sourceFile;  into destinationFile.parent;  rename(sourceFile.name, destinationFile.name) }
-        }
+        def sourceFile = new File("${appDir}/build/intermediates/cmake/release/obj/arm64-v8a/","libhifiCodec.so")
+        def destinationFile = new File("${appDir}/src/main/jniLibs/arm64-v8a", "libplugins_libhifiCodec.so")
+        copy { from sourceFile;  into destinationFile.parent;  rename(sourceFile.name, destinationFile.name) }
     }
 }