Merge "Don't publish AIDLs in aar." into gradle_0.9gradle_0.9

1 files changed, 11 insertions, 9 deletions

diff --git a/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/variant/LibraryVariantFactory.groovy b/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/variant/LibraryVariantFactory.groovy
index 3a2587f816..91f58232e0 100644
--- a/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/variant/LibraryVariantFactory.groovy
+++ b/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/variant/LibraryVariantFactory.groovy
@@ -169,13 +169,14 @@ public class LibraryVariantFactory implements VariantFactory {
                 "$project.buildDir/$DIR_BUNDLES/${dirName}/jni"))
 
         // package the aidl files into the bundle folder
-        Sync packageAidl = basePlugin.project.tasks.create(
-                "package${fullName.capitalize()}Aidl",
-                Sync)
-        // packageAidl from 3 sources. the order is important to make sure the override works well.
-        packageAidl.from(variantConfig.aidlSourceList).include("**/*.aidl")
-        packageAidl.into(basePlugin.project.file(
-                "$basePlugin.project.buildDir/$DIR_BUNDLES/${dirName}/$SdkConstants.FD_AIDL"))
+        // TODO: reenable when we can generate a single AIDL file with all the parcelable.
+//        Sync packageAidl = basePlugin.project.tasks.create(
+//                "package${fullName.capitalize()}Aidl",
+//                Sync)
+//        // packageAidl from 3 sources. the order is important to make sure the override works well.
+//        packageAidl.from(variantConfig.aidlSourceList).include("**/*.aidl")
+//        packageAidl.into(basePlugin.project.file(
+//                "$basePlugin.project.buildDir/$DIR_BUNDLES/${dirName}/$SdkConstants.FD_AIDL"))
 
         // package the renderscript header files files into the bundle folder
         Sync packageRenderscript = project.tasks.create(
@@ -216,7 +217,8 @@ public class LibraryVariantFactory implements VariantFactory {
             // hack since bundle can't depend on variantData.proguardTask
             mergeProGuardFileTask.dependsOn variantData.proguardTask
 
-            bundle.dependsOn packageRes, packageAidl, packageRenderscript, mergeProGuardFileTask, lintCopy, packageJniLibs
+            bundle.dependsOn packageRes, /*packageAidl,*/ packageRenderscript, mergeProGuardFileTask,
+                    lintCopy, packageJniLibs
         } else {
             Sync packageLocalJar = project.tasks.create(
                     "package${fullName.capitalize()}LocalJar",
@@ -249,7 +251,7 @@ public class LibraryVariantFactory implements VariantFactory {
                 jar.exclude(packageName + "/BuildConfig.class")
             }
 
-            bundle.dependsOn packageRes, jar, packageAidl, packageRenderscript, packageLocalJar,
+            bundle.dependsOn packageRes, jar, /*packageAidl,*/ packageRenderscript, packageLocalJar,
                     mergeProGuardFileTask, lintCopy, packageJniLibs
         }