commit 4efd038be1300cefd5abc6cb1324b4fc8508ebaa
author Chris Banes <chrisbanes@google.com> Thu Mar 05 20:04:05 2015 +0000
committer Tony Mantler <nicoya@google.com> Mon Mar 16 14:33:25 2015 -0700
tree f36969478b6bc6a341306066f7770c31a54ee9e0
parent 973d4b3f71ef1f395107ccf238e13ce2561097e6

Update Support library gradle build files. DO NOT MERGE.

Means we can now develop the support lib using
Android Studio and Gradle.

Need to update the Gradle prebuilts.

(cherry picked from commit 6a4c14b929df9d5ca592e0ee178bfd8784fe7c0a)

Change-Id: I90cebec4b492689f24a9669663630c0f02fd1035

v4/build.gradle

diff --git a/v4/build.gradle b/v4/build.gradle
index d37bb27..939b0c8 100644
--- a/v4/build.gradle
+++ b/v4/build.gradle
@@ -68,7 +68,6 @@
 
 android {
     compileSdkVersion 4
-    buildToolsVersion "19.0.1"
 
     defaultConfig {
         minSdkVersion 4
@@ -101,7 +100,7 @@
 
     def name = variant.buildType.name
 
-    if (name.equals(com.android.builder.BuilderConstants.DEBUG)) {
+    if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) {
         return; // Skip debug builds.
     }
     def suffix = name.capitalize()
@@ -112,9 +111,9 @@
         from 'LICENSE.txt'
     }
     def javadocTask = project.tasks.create(name: "javadoc${suffix}", type: Javadoc) {
-        source android.sourceSets.main.allJava
+        source android.sourceSets.main.java
         classpath = files(variant.javaCompile.classpath.files) + files(
-                "${android.plugin.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar")
+                "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar")
     }
 
     def javadocJarTask = project.tasks.create(name: "javadocJar${suffix}", type: Jar) {
@@ -124,12 +123,12 @@
 
     def sourcesJarTask = project.tasks.create(name: "sourceJar${suffix}", type: Jar) {
         classifier = 'sources'
-        from android.sourceSets.main.allSource
+        from android.sourceSets.main.java.srcDirs
     }
 
     project.ext.allSS.each { ss ->
-        javadocTask.source ss.allJava
-        sourcesJarTask.from ss.allSource
+        javadocTask.source ss.java
+        sourcesJarTask.from ss.java.srcDirs
     }
 
     artifacts.add('archives', javadocJarTask);