Add test project for api in library projects.

Also tweak the API a bit.

Change-Id: I6cb10b4d770f9054f269d600d41a24b7e2fdc2e1

5 files changed, 18 insertions, 3 deletions

diff --git a/gradle/src/main/groovy/com/android/build/gradle/BuildVariant.groovy b/gradle/src/main/groovy/com/android/build/gradle/BuildVariant.groovy
index 2fe7531..ebcef1c 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/BuildVariant.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/BuildVariant.groovy
@@ -30,6 +30,7 @@ import com.android.builder.BuildType
 import com.android.builder.ProductFlavor
 import org.gradle.api.Task
 import org.gradle.api.tasks.Copy
+import org.gradle.api.tasks.bundling.Zip
 import org.gradle.api.tasks.compile.JavaCompile
 
 /**
@@ -166,6 +167,12 @@ public interface BuildVariant {
     ZipAlign getZipAlign()
 
     /**
+     * Returns the Library AAR packaging task.
+     */
+    @Nullable
+    Zip getPackageLibrary()
+
+    /**
      * Returns the assemble task.
      */
     @Nullable
diff --git a/gradle/src/main/groovy/com/android/build/gradle/LibraryPlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/LibraryPlugin.groovy
index 8049a41..8f6d6cf 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/LibraryPlugin.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/LibraryPlugin.groovy
@@ -210,6 +210,7 @@ public class LibraryPlugin extends BasePlugin implements Plugin<Project> {
         }
         bundle.from(project.file("$project.buildDir/$DIR_BUNDLES/${variant.dirName}"))
 
+        variant.packageLibTask = bundle
         variant.outputFile = bundle.archivePath
 
         project.artifacts.add(buildTypeData.buildType.name, bundle)
diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/ApplicationVariant.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/ApplicationVariant.groovy
index 5a1b114..c8d869a 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/ApplicationVariant.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/ApplicationVariant.groovy
@@ -31,6 +31,7 @@ import com.android.builder.ProductFlavor
 import com.android.builder.VariantConfiguration
 import org.gradle.api.Task
 import org.gradle.api.tasks.Copy
+import org.gradle.api.tasks.bundling.Zip
 import org.gradle.api.tasks.compile.JavaCompile
 
 /**
@@ -55,6 +56,8 @@ public abstract class ApplicationVariant {
     PackageApplicationTask packageApplicationTask
     ZipAlignTask zipAlignTask
 
+    Zip packageLibTask
+
     File outputFile
 
     Task assembleTask
diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/DefaultBuildVariant.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/DefaultBuildVariant.groovy
index 7157e80..790f7b7 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/DefaultBuildVariant.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/DefaultBuildVariant.groovy
@@ -28,6 +28,7 @@ import com.android.builder.BuildType
 import com.android.builder.ProductFlavor
 import org.gradle.api.Task
 import org.gradle.api.tasks.Copy
+import org.gradle.api.tasks.bundling.Zip
 import org.gradle.api.tasks.compile.JavaCompile
 
 /**
@@ -135,11 +136,17 @@ public class DefaultBuildVariant implements BuildVariant {
         return variant.packageApplicationTask
     }
 
+    @Override
     ZipAlign getZipAlign() {
         return variant.zipAlignTask
     }
 
     @Override
+    Zip getPackageLibrary() {
+        return variant.packageLibTask
+    }
+
+    @Override
     Task getAssemble() {
         return variant.assembleTask
     }
diff --git a/gradle/src/test/groovy/com/android/build/gradle/ProjectTest.groovy b/gradle/src/test/groovy/com/android/build/gradle/ProjectTest.groovy
index 045d50e..59e09e4 100644
--- a/gradle/src/test/groovy/com/android/build/gradle/ProjectTest.groovy
+++ b/gradle/src/test/groovy/com/android/build/gradle/ProjectTest.groovy
@@ -109,7 +109,6 @@ class ProjectTest extends BaseTest {
         for (File project : projects) {
             String name = project.name
             if (!builtProjects.contains(name)) {
-                System.out.println(">>>> " + name)
                 buildProject(name)
             }
         }
@@ -118,7 +117,6 @@ class ProjectTest extends BaseTest {
     private void buildProject(String name) {
         File project = new File(testDir, name)
         builtProjects.add(name)
-        System.out.println("### " + name)
 
         buildProject(project, "clean", "assemble")
     }
@@ -134,7 +132,6 @@ class ProjectTest extends BaseTest {
                     .useGradleVersion("1.2")
                     .forProjectDirectory(project)
                     .connect()
-//                    .useInstallation(new File("/Users/xav/Desktop/gradle-1.2"))
 
             connection.newBuild().forTasks(tasks).run()
         } finally {