commit ef3b492b5ecf5fab39d69d990c26f9ddad6dc4e7
author Aurimas Liutikas <aurimas@google.com> Wed Jun 28 10:44:59 2017 -0700
committer Aurimas Liutikas <aurimas@google.com> Wed Jun 28 20:27:11 2017 +0000
tree e367a524d25f6726e77e0d40dc8827951fde2138
parent ce92ed7b666861a8a2ee3cfc1abd9b7fafa2eb6c

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 50f2890..eb1c001 100644
--- a/buildSrc/init.gradle
+++ b/buildSrc/init.gradle
@@ -301,9 +301,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