Revert "Support packaging proto files into android archives(aar) (#414)…

…" (#437) This reverts commit 15607b4.
google · Oct 2, 2020 · 6dbd5bd · 6dbd5bd
1 parent 728b686
commit 6dbd5bd
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 302 deletions.
diff --git a/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy b/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
@@ -220,11 +220,6 @@ class ProtobufPlugin implements Plugin<Project> {
      */
     private void addProtoTasks() {
       if (Utils.isAndroidProject(project)) {
-        // Avoid packaging proto files into apk.
-        if (!project.android.hasProperty('libraryVariants')) {
-          project.android.packagingOptions.exclude("**/*.proto")
-        }
-
         getNonTestVariants().each { variant ->
           addTasksForVariant(variant, false)
         }
@@ -276,8 +271,6 @@ class ProtobufPlugin implements Plugin<Project> {
 
       variant.sourceSets.each {
         setupExtractProtosTask(generateProtoTask, it.name)
-        // Add proto files to java resources, and package them into aar/classes.jar.
-        it.resources.srcDirs += generateProtoTask.sourceFiles
       }
 
       if (variant.hasProperty("compileConfiguration")) {

diff --git a/src/test/groovy/com/google/protobuf/gradle/ProtobufAndroidPluginTest.groovy b/src/test/groovy/com/google/protobuf/gradle/ProtobufAndroidPluginTest.groovy
@@ -31,12 +31,8 @@ class ProtobufAndroidPluginTest extends Specification {
     File testProjectLiteStaging = ProtobufPluginTestHelper.projectBuilder('testProjectLite')
         .copyDirs('testProjectLite')
         .build()
-    File testProjectAndroidLibrary = ProtobufPluginTestHelper.projectBuilder('testProjectAndroidLibrary')
-            .copyDirs('testProjectAndroidLibrary')
-            .build()
     File mainProjectDir = ProtobufPluginTestHelper.projectBuilder('testProjectAndroidMain')
-        .copySubProjects(testProjectStaging, testProjectLiteStaging, testProjectAndroidStaging,
-                testProjectAndroidLibrary)
+        .copySubProjects(testProjectStaging, testProjectLiteStaging, testProjectAndroidStaging)
         .withAndroidPlugin(agpVersion)
         .build()
     when: "build is invoked"
@@ -66,12 +62,8 @@ class ProtobufAndroidPluginTest extends Specification {
     File testProjectLiteStaging = ProtobufPluginTestHelper.projectBuilder('testProjectLite')
             .copyDirs('testProjectLite')
             .build()
-    File testProjectAndroidLibrary = ProtobufPluginTestHelper.projectBuilder('testProjectAndroidLibrary')
-            .copyDirs('testProjectAndroidLibrary')
-            .build()
     File mainProjectDir = ProtobufPluginTestHelper.projectBuilder('testProjectAndroidMain')
-            .copySubProjects(testProjectStaging, testProjectLiteStaging, testProjectAndroidStaging,
-                    testProjectAndroidLibrary)
+            .copySubProjects(testProjectStaging, testProjectLiteStaging, testProjectAndroidStaging)
             .withAndroidPlugin(agpVersion)
             .build()
     and:
@@ -130,12 +122,8 @@ class ProtobufAndroidPluginTest extends Specification {
     File testProjectLiteStaging = ProtobufPluginTestHelper.projectBuilder('testProjectLite')
         .copyDirs('testProjectLite')
         .build()
-    File testProjectAndroidLibraryStaging = ProtobufPluginTestHelper.projectBuilder('testProjectAndroidLibrary')
-            .copyDirs('testProjectAndroidLibrary')
-            .build()
     File mainProjectDir = ProtobufPluginTestHelper.projectBuilder('testProjectAndroidMain')
-        .copySubProjects(testProjectStaging, testProjectLiteStaging, testProjectAndroidStaging,
-                testProjectAndroidLibraryStaging)
+        .copySubProjects(testProjectStaging, testProjectLiteStaging, testProjectAndroidStaging)
         .withAndroidPlugin(agpVersion)
         .withKotlin(kotlinVersion)
         .build()

diff --git a/testProjectAndroid/src/main/java/io/grpc/helloaarexample/HelloAarActivity.java b/testProjectAndroid/src/main/java/io/grpc/helloaarexample/HelloAarActivity.java
diff --git a/testProjectAndroidBase/build_base.gradle b/testProjectAndroidBase/build_base.gradle
@@ -110,9 +110,6 @@ dependencies {
     compile(project(':testProjectLite')) {
       exclude module: "protobuf-lite"
     }
-    compile(project(':testProjectAndroidLibrary')) {
-        exclude module: "protobuf-lite"
-    }
     protobuf files('lib/protos.jar')
     testCompile 'junit:junit:4.12'
 }

diff --git a/testProjectAndroidBase/src/main/AndroidManifest.xml b/testProjectAndroidBase/src/main/AndroidManifest.xml
@@ -17,13 +17,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-          android:name="io.grpc.helloaarexample.HelloAarActivity"
-          android:label="@string/app_name_aar" >
-          <intent-filter>
-            <category android:name="android.intent.category.LAUNCHER" />
-          </intent-filter>
-        </activity>
     </application>
 
 </manifest>
diff --git a/testProjectAndroidBase/src/main/res/values/strings.xml b/testProjectAndroidBase/src/main/res/values/strings.xml
@@ -1,4 +1,3 @@
 <resources>
     <string name="app_name">GrpcHelloworldExample</string>
-    <string name="app_name_aar">GrpcHelloworldExampleForAar</string>
 </resources>
diff --git a/testProjectAndroidKotlin/src/main/kotlin/io/grpc/helloaarexample/HelloAarActivityKotlin.kt b/testProjectAndroidKotlin/src/main/kotlin/io/grpc/helloaarexample/HelloAarActivityKotlin.kt
diff --git a/testProjectAndroidLibrary/build.gradle b/testProjectAndroidLibrary/build.gradle
diff --git a/testProjectAndroidLibrary/settings.gradle b/testProjectAndroidLibrary/settings.gradle
diff --git a/testProjectAndroidLibrary/src/main/AndroidManifest.xml b/testProjectAndroidLibrary/src/main/AndroidManifest.xml
diff --git a/testProjectAndroidLibrary/src/main/proto/helloAar.proto b/testProjectAndroidLibrary/src/main/proto/helloAar.proto