commit 3b075239d83afb048695f6061a798bf3b37e2bae
author Aurimas Liutikas <aurimas@google.com> Wed Jun 28 10:39:39 2017 -0700
committer Aurimas Liutikas <aurimas@google.com> Wed Jun 28 20:23:59 2017 +0000
tree c0b7738a0aeaec6285e26ad6494f7b30220641f0
parent d35ad05d156007a3db417eae2e2e92f1d98b405e

Move to using Android Gradle Plugin 3.0.0-alpha4

Bug: 62578429
Test: ./gradlew buildOnServer
Change-Id: I354fb8d4edf8eacc75117f4cff13184865fe6b22

buildSrc/init.gradle

diff --git a/buildSrc/init.gradle b/buildSrc/init.gradle
index 4e66dc8..2cde002 100644
--- a/buildSrc/init.gradle
+++ b/buildSrc/init.gradle
@@ -281,9 +281,10 @@
                 task.doLast {
                     def source = testApk ? project.android.sourceSets.androidTest
                             : project.android.sourceSets.main
-                    if (task.hasProperty("outputFile") && !source.java.sourceFiles.isEmpty()) {
+                    if (task.hasProperty("outputDirectory") && !source.java.sourceFiles.isEmpty()) {
                         copy {
-                            from(task.outputFile)
+                            from(task.outputDirectory)
+                            include '*.apk'
                             into(rootProject.ext.testApkDistOut)
                             rename { String fileName ->
                                 // multiple modules may have the same name so prefix the name with