Updates to viewer gradle scripts

BUG=skia:

Change-Id: Ib847e5ae89d2ac3f496507f69f82f5bac4914f36
Reviewed-on: https://skia-review.googlesource.com/8133
Reviewed-by: Chris Dalton <csmartdalton@google.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/platform_tools/android/apps/build.gradle b/platform_tools/android/apps/build.gradle
index ee279e8b91..08dbc9f4f6 100644
--- a/platform_tools/android/apps/build.gradle
+++ b/platform_tools/android/apps/build.gradle
@@ -28,8 +28,10 @@ def setupSkiaLibraryBuild(project, appVariants, appName) {
         buildNativeLib.onlyIf { !project.hasProperty("suppressNativeBuild") }
 
         def copyNativeLib = project.task("${variant.name}_CopySkiaLib", type:Copy) {
-            from getVariantOutDir(project, variant).skiaOut
-            into getVariantOutDir(project, variant).androidOut
+            def fromDir = "../../../../" + getVariantOutDir(project, variant).skiaOut
+            def intoDir = getVariantOutDir(project, variant).androidOut
+            from fromDir
+            into intoDir
             include "${appName}.so"
         }
 
@@ -38,7 +40,7 @@ def setupSkiaLibraryBuild(project, appVariants, appName) {
             it.name.toLowerCase().contains("compile" + variant.name.toLowerCase()) &&
                     it.name.toLowerCase().endsWith("ndk")
         }
-        compileTask.getAt(0).dependsOn copyNativeLib
+        compileTask.findAll()*.dependsOn copyNativeLib
         copyNativeLib.dependsOn buildNativeLib
     }
 }