From 69926430994a0bd0e7f6360630ce82e925c8817d Mon Sep 17 00:00:00 2001
From: Chengyuan Zhang <chengyuanzhang@google.com>
Date: Tue, 3 Nov 2020 02:19:49 -0800
Subject: [PATCH 01/10] Create an Android library project and an application
 project base depending on it.

---
 .../androidTest/proto/sample.proto            |  18 ++
 .../build_base.gradle                         | 274 ++++++++++++++++++
 .../main/AndroidManifest.xml                  |  22 ++
 .../main/proto/helloworld.proto               |  55 ++++
 .../main/res/layout/activity_helloworld.xml   |  54 ++++
 .../main/res/mipmap-hdpi/ic_launcher.png      | Bin 0 -> 3418 bytes
 .../main/res/mipmap-mdpi/ic_launcher.png      | Bin 0 -> 2206 bytes
 .../main/res/mipmap-xhdpi/ic_launcher.png     | Bin 0 -> 4842 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 0 -> 7718 bytes
 .../main/res/values/strings.xml               |   3 +
 .../proguard-rules.pro                        |  17 ++
 .../test/proto/unittest.proto                 |  18 ++
 testProjectAndroidLibrary/build.gradle        |  91 ++++++
 testProjectAndroidLibrary/settings.gradle     |   1 +
 .../src/main/AndroidManifest.xml              |   5 +
 .../src/main/proto/messages.proto             | 138 +++++++++
 16 files changed, 696 insertions(+)
 create mode 100644 testProjectAndroidDependentBase/androidTest/proto/sample.proto
 create mode 100644 testProjectAndroidDependentBase/build_base.gradle
 create mode 100644 testProjectAndroidDependentBase/main/AndroidManifest.xml
 create mode 100644 testProjectAndroidDependentBase/main/proto/helloworld.proto
 create mode 100644 testProjectAndroidDependentBase/main/res/layout/activity_helloworld.xml
 create mode 100644 testProjectAndroidDependentBase/main/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 testProjectAndroidDependentBase/main/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 testProjectAndroidDependentBase/main/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 testProjectAndroidDependentBase/main/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 testProjectAndroidDependentBase/main/res/values/strings.xml
 create mode 100644 testProjectAndroidDependentBase/proguard-rules.pro
 create mode 100644 testProjectAndroidDependentBase/test/proto/unittest.proto
 create mode 100644 testProjectAndroidLibrary/build.gradle
 create mode 100644 testProjectAndroidLibrary/settings.gradle
 create mode 100644 testProjectAndroidLibrary/src/main/AndroidManifest.xml
 create mode 100644 testProjectAndroidLibrary/src/main/proto/messages.proto

diff --git a/testProjectAndroidDependentBase/androidTest/proto/sample.proto b/testProjectAndroidDependentBase/androidTest/proto/sample.proto
new file mode 100644
index 00000000..70d912cb
--- /dev/null
+++ b/testProjectAndroidDependentBase/androidTest/proto/sample.proto
@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+option java_package = "com.example.tutorial";
+option java_outer_classname = "OuterSample";
+option java_multiple_files = true;
+
+// From the main sourceSet
+import "helloworld.proto";
+
+message Msg {
+    string foo = 1;
+    SecondMsg blah = 2;
+}
+
+message SecondMsg {
+    int32 blah = 1;
+    helloworld.HelloReply reply = 2;
+}
diff --git a/testProjectAndroidDependentBase/build_base.gradle b/testProjectAndroidDependentBase/build_base.gradle
new file mode 100644
index 00000000..fd327a65
--- /dev/null
+++ b/testProjectAndroidDependentBase/build_base.gradle
@@ -0,0 +1,274 @@
+repositories {
+    maven { url 'https://maven.google.com' }
+    maven { url "https://plugins.gradle.org/m2/" }
+}
+
+buildscript {
+    repositories {
+        maven { url 'https://maven.google.com' }
+        maven { url "https://plugins.gradle.org/m2/" }
+    }
+}
+
+android {
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
+
+    defaultConfig {
+        applicationId "io.grpc.helloworldexample"
+        minSdkVersion 7
+        targetSdkVersion 23
+        versionCode 1
+        versionName "1.0"
+    }
+
+    flavorDimensions 'abi', 'version'
+
+    productFlavors {
+        freeapp {
+            dimension 'version'
+        }
+        retailapp {
+            dimension 'version'
+        }
+        x86 {
+            dimension 'abi'
+        }
+        arm {
+            dimension 'abi'
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_7
+        targetCompatibility = JavaVersion.VERSION_1_7
+    }
+
+    packagingOptions {
+        exclude 'io/grpc/testing/integration/empty.proto'
+        exclude 'io/grpc/testing/integration/test.proto'
+        exclude 'io/grpc/testing/integration/messages.proto'
+        exclude 'tmp/stuff.proto'
+    }
+
+    // https://github.com/square/okio/issues/58
+    lintOptions {
+        warning 'InvalidPackage'
+        abortOnError false
+    }
+
+    dexOptions {
+        javaMaxHeapSize "1g"
+        threadCount 1 // reduce predex thread count to limit memory usage
+    }
+}
+
+protobuf {
+    protoc {
+        artifact = 'com.google.protobuf:protoc:3.0.0'
+    }
+    plugins {
+        grpc {
+            artifact = 'io.grpc:protoc-gen-grpc-java:1.0.0-pre2'
+        }
+        javalite {
+            artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
+        }
+    }
+    generateProtoTasks {
+        all()*.plugins {
+            javalite { }
+        }
+        ofNonTest()*.plugins {
+            grpc {
+                // Options added to --grpc_out
+                option 'lite'
+            }
+        }
+    }
+}
+
+dependencies {
+    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'com.squareup.okhttp:okhttp:2.7.5'
+    compile 'javax.annotation:javax.annotation-api:1.2'
+    compile 'com.google.protobuf:protobuf-lite:3.0.0'
+    compile 'io.grpc:grpc-core:1.0.0-pre2'
+    compile 'io.grpc:grpc-stub:1.0.0-pre2'
+    compile 'io.grpc:grpc-okhttp:1.0.0-pre2'
+    compile('io.grpc:grpc-protobuf-lite:1.0.0-pre2') {
+        // Otherwise Android compile will complain "Multiple dex files define ..."
+        exclude module: "protobuf-lite"
+    }
+    compile(project(':testProjectAndroidLibrary')) {
+        exclude module: "protobuf-lite"
+    }
+    protobuf files('lib/protos.jar')
+    testCompile 'junit:junit:4.12'
+}
+
+def assertJavaCompileHasProtoGeneratedDir(Object variant, Collection<String> codegenPlugins) {
+    rootProject.assertJavaCompileHasProtoGeneratedDir(project, variant.name, variant.javaCompileProvider.get(), codegenPlugins)
+}
+
+afterEvaluate {
+    // 'gradle test' will run the unit tests, which is still experimental in
+    // Android plugin, and would do nothing with our setup. We make 'test' to
+    // trigger the "androidTest" Java compile tasks.
+    android.testVariants.each { testVariant ->
+        test.dependsOn testVariant.javaCompileProvider
+    }
+
+    test.doLast {
+        assert [
+                'generateArmFreeappDebugAndroidTestProto',
+                'generateArmFreeappDebugUnitTestProto',
+                'generateArmFreeappReleaseUnitTestProto',
+                'generateArmFreeappDebugProto',
+                'generateArmFreeappReleaseProto',
+                'generateArmRetailappDebugAndroidTestProto',
+                'generateArmRetailappDebugUnitTestProto',
+                'generateArmRetailappReleaseUnitTestProto',
+                'generateArmRetailappDebugProto',
+                'generateArmRetailappReleaseProto',
+                'generateX86FreeappDebugAndroidTestProto',
+                'generateX86FreeappDebugUnitTestProto',
+                'generateX86FreeappReleaseUnitTestProto',
+                'generateX86FreeappDebugProto',
+                'generateX86FreeappReleaseProto',
+                'generateX86RetailappDebugAndroidTestProto',
+                'generateX86RetailappDebugUnitTestProto',
+                'generateX86RetailappReleaseUnitTestProto',
+                'generateX86RetailappDebugProto',
+                'generateX86RetailappReleaseProto',
+        ] as Set == protobuf.generateProtoTasks.all().collect({ it.name }) as Set
+
+        assert [
+                'generateArmFreeappDebugAndroidTestProto',
+                'generateArmFreeappDebugUnitTestProto',
+                'generateArmFreeappReleaseUnitTestProto',
+                'generateArmRetailappDebugAndroidTestProto',
+                'generateArmRetailappDebugUnitTestProto',
+                'generateArmRetailappReleaseUnitTestProto',
+                'generateX86FreeappDebugAndroidTestProto',
+                'generateX86FreeappDebugUnitTestProto',
+                'generateX86FreeappReleaseUnitTestProto',
+                'generateX86RetailappDebugAndroidTestProto',
+                'generateX86RetailappDebugUnitTestProto',
+                'generateX86RetailappReleaseUnitTestProto',
+        ] as Set == protobuf.generateProtoTasks.ofTest().collect({ it.name }) as Set
+
+        assert [
+                'generateArmFreeappDebugProto',
+                'generateArmFreeappReleaseProto',
+                'generateArmRetailappDebugProto',
+                'generateArmRetailappReleaseProto',
+                'generateX86FreeappDebugProto',
+                'generateX86FreeappReleaseProto',
+                'generateX86RetailappDebugProto',
+                'generateX86RetailappReleaseProto',
+        ] as Set == protobuf.generateProtoTasks.ofNonTest().collect({ it.name }) as Set
+
+        assert [
+                'generateArmFreeappDebugAndroidTestProto',
+                'generateArmFreeappDebugUnitTestProto',
+                'generateArmFreeappReleaseUnitTestProto',
+                'generateArmFreeappDebugProto',
+                'generateArmFreeappReleaseProto',
+                'generateX86FreeappDebugAndroidTestProto',
+                'generateX86FreeappDebugUnitTestProto',
+                'generateX86FreeappReleaseUnitTestProto',
+                'generateX86FreeappDebugProto',
+                'generateX86FreeappReleaseProto',
+        ] as Set == protobuf.generateProtoTasks.ofFlavor('freeapp').collect({ it.name }) as Set
+
+        assert [
+                'generateArmRetailappDebugAndroidTestProto',
+                'generateArmRetailappDebugUnitTestProto',
+                'generateArmRetailappReleaseUnitTestProto',
+                'generateArmRetailappDebugProto',
+                'generateArmRetailappReleaseProto',
+                'generateX86RetailappDebugAndroidTestProto',
+                'generateX86RetailappDebugUnitTestProto',
+                'generateX86RetailappReleaseUnitTestProto',
+                'generateX86RetailappDebugProto',
+                'generateX86RetailappReleaseProto',
+        ] as Set == protobuf.generateProtoTasks.ofFlavor('retailapp').collect({ it.name }) as Set
+
+        assert [
+                'generateX86FreeappDebugAndroidTestProto',
+                'generateX86FreeappDebugUnitTestProto',
+                'generateX86FreeappReleaseUnitTestProto',
+                'generateX86FreeappDebugProto',
+                'generateX86FreeappReleaseProto',
+                'generateX86RetailappDebugAndroidTestProto',
+                'generateX86RetailappDebugUnitTestProto',
+                'generateX86RetailappReleaseUnitTestProto',
+                'generateX86RetailappDebugProto',
+                'generateX86RetailappReleaseProto',
+        ] as Set == protobuf.generateProtoTasks.ofFlavor('x86').collect({ it.name }) as Set
+
+        assert [
+                'generateArmFreeappDebugAndroidTestProto',
+                'generateArmFreeappDebugUnitTestProto',
+                'generateArmFreeappReleaseUnitTestProto',
+                'generateArmFreeappDebugProto',
+                'generateArmFreeappReleaseProto',
+                'generateArmRetailappDebugAndroidTestProto',
+                'generateArmRetailappDebugUnitTestProto',
+                'generateArmRetailappReleaseUnitTestProto',
+                'generateArmRetailappDebugProto',
+                'generateArmRetailappReleaseProto',
+        ] as Set == protobuf.generateProtoTasks.ofFlavor('arm').collect({ it.name }) as Set
+
+        assert [
+                'generateArmFreeappDebugAndroidTestProto',
+                'generateArmFreeappDebugUnitTestProto',
+                'generateArmFreeappDebugProto',
+                'generateArmRetailappDebugAndroidTestProto',
+                'generateArmRetailappDebugUnitTestProto',
+                'generateArmRetailappDebugProto',
+                'generateX86FreeappDebugAndroidTestProto',
+                'generateX86FreeappDebugUnitTestProto',
+                'generateX86FreeappDebugProto',
+                'generateX86RetailappDebugAndroidTestProto',
+                'generateX86RetailappDebugUnitTestProto',
+                'generateX86RetailappDebugProto'
+        ] as Set == protobuf.generateProtoTasks.ofBuildType('debug').collect({ it.name }) as Set
+
+        assert [
+                'generateArmFreeappReleaseProto',
+                'generateArmFreeappReleaseUnitTestProto',
+                'generateArmRetailappReleaseProto',
+                'generateArmRetailappReleaseUnitTestProto',
+                'generateX86FreeappReleaseProto',
+                'generateX86FreeappReleaseUnitTestProto',
+                'generateX86RetailappReleaseProto',
+                'generateX86RetailappReleaseUnitTestProto',
+        ] as Set == protobuf.generateProtoTasks.ofBuildType('release').collect({ it.name }) as Set
+
+        assert ['generateX86FreeappDebugAndroidTestProto'] as Set ==
+                protobuf.generateProtoTasks.ofVariant('x86FreeappDebugAndroidTest').collect({ it.name }) as Set
+
+        // "androidTest" sourceSet is not a flavor
+        assert [] as Set == protobuf.generateProtoTasks.ofFlavor('androidTest').collect({ it.name }) as Set
+
+        // "unitTest" sourceset is not a flavor
+        assert [] as Set == protobuf.generateProtoTasks.ofFlavor('unitTest').collect({ it.name }) as Set
+
+        android.applicationVariants.each { variant ->
+            assertJavaCompileHasProtoGeneratedDir(variant, ['javalite', 'grpc'])
+        }
+
+        android.testVariants.each { variant ->
+            assertJavaCompileHasProtoGeneratedDir(variant, ['javalite'])
+        }
+    }
+}
diff --git a/testProjectAndroidDependentBase/main/AndroidManifest.xml b/testProjectAndroidDependentBase/main/AndroidManifest.xml
new file mode 100644
index 00000000..8c40f116
--- /dev/null
+++ b/testProjectAndroidDependentBase/main/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="io.grpc.helloworldexample" >
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/Base.V7.Theme.AppCompat.Light" >
+        <activity
+            android:name=".HelloworldActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/testProjectAndroidDependentBase/main/proto/helloworld.proto b/testProjectAndroidDependentBase/main/proto/helloworld.proto
new file mode 100644
index 00000000..8de3aa8e
--- /dev/null
+++ b/testProjectAndroidDependentBase/main/proto/helloworld.proto
@@ -0,0 +1,55 @@
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+// From testProject: src/nano/proto
+import "messages.proto";
+
+option java_package = "io.grpc.helloworldexample";
+
+package helloworld;
+
+// The greeting service definition.
+service Greeter {
+  // Sends a greeting
+  rpc SayHello (HelloRequest) returns (HelloReply) {}
+}
+
+// The request message containing the user's name.
+message HelloRequest {
+  string name = 1;
+  // Uses message type from messages.proto
+  grpc.testing.SimpleContext context = 2;
+}
+
+// The response message containing the greetings
+message HelloReply {
+  string message = 1;
+}
diff --git a/testProjectAndroidDependentBase/main/res/layout/activity_helloworld.xml b/testProjectAndroidDependentBase/main/res/layout/activity_helloworld.xml
new file mode 100644
index 00000000..00ca04ce
--- /dev/null
+++ b/testProjectAndroidDependentBase/main/res/layout/activity_helloworld.xml
@@ -0,0 +1,54 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              tools:context=".MainActivity"
+              android:orientation="vertical" >
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+        <EditText
+                android:id="@+id/host_edit_text"
+                android:layout_weight="2"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:hint="Enter Host" />
+        <EditText
+                android:id="@+id/port_edit_text"
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:inputType="numberDecimal"
+                android:hint="Enter Port" />
+    </LinearLayout>
+
+
+    <EditText
+            android:id="@+id/message_edit_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="Enter message to send" />
+
+    <Button
+            android:id="@+id/send_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="sendMessage"
+            android:text="Send Grpc Request" />
+
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp"
+            android:textSize="16dp"
+            android:text="Response:" />
+
+    <TextView
+            android:id="@+id/grpc_response_text"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:textSize="16dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/testProjectAndroidDependentBase/main/res/mipmap-hdpi/ic_launcher.png b/testProjectAndroidDependentBase/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..cde69bcccec65160d92116f20ffce4fce0b5245c
GIT binary patch
literal 3418
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

literal 0
HcmV?d00001

diff --git a/testProjectAndroidDependentBase/main/res/mipmap-mdpi/ic_launcher.png b/testProjectAndroidDependentBase/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..c133a0cbd379f5af6dbf1a899a0293ca5eccfad0
GIT binary patch
literal 2206
zcmZ{mc|6mPAICqNwJrBe)OTwlM~;a|Uz&T!k&1?zWA4p4M`7F7`J;wP4IvS^nJ7{y
zAtgDMD>=W8<&GtU-}>|S$M5}kyxz~p>-~Pb{(irc?QF~icx8A201&Xin%Hxx@kekd
zw>yHjlemC*8(JFz05gs6x7#7EM|xoGtpVVs0szqB0bqwaqAdVG7&rLc6#(=y0YEA!
z=jFw}xeKVfmAMI*+}bv7qH=LK2#X5^06wul0s+}M(f|O<w=glh>@&WMyG9frlGyLb
z&Eix=47rL84J+tEWcy_XTyc*xw9uOQy`qmHCjAeJ?d=dUhm;P}^F=LH42AEMIh6X8
z*I7Q1jK%gVlL|8w?%##)xSIY`Y+9$SC8!X*_A*S0SWOKNUtza(FZHahoC2|6f=*oD
zxJ8-RZk!+YpG+J}Uqnq$y%y>O^@e5M3SSw^29PMwt%8lX^9FT=O@VX$FCLBdlj#<{
zJWWH<#iU!^E7axvK+`u;$*sGq1SmGYc&{g03Md&$r@btQSUIjl&yJXA&=79FdJ+D<
z4K^ORdM{M0b2{wRROvjz1@Rb>5dFb@gfkYiIOAK<w6>M(NR3*1JpeR_Hk3>W<D;EJ
z=L^rbEb1z`&n*lf)V?1WAH;irYq7~E^R{os%v7=+?7ik??QMBnQJ%3+(IM;60ly~m
z@ZOb_{t@czht$nEo{x$AT}*`jW=~n)lob!)RV@huYj}T+*!>GvU&>}D^HXZ02JUnM
z@1s_HhX#rG7;|FkSh2#agJ_2fREo)L`ws+6{?IeWV(>Dy8A(6)IjpSH-n_uO=810y
z#4?ez9NnERv6k)N13sXmx)=sv=$$i_QK`hp%I2cyi*J=ihBWZLwpx9Z#|s;+XI!0s
zLjYRVt!1KO;mnb7ZL~XoefWU02f{jcY`2wZ4QK+q7gc4iz%d0)5$tPUg~$jVI6vFO
zK^wG7t=**T40km@TNUK+WTx<1mL|6Tn6+kB+E$Gpt8SauF9E-CR9Uui_EHn_nmBqS
z>o#G}58nHFtICqJPx<_?UZ;z0_(0&UqMnTftMKW@%AxYpa!g0fxGe060^xkRtYguj
ze&fPtC!?RgE}FsE0*^2lnE>42K#jp^nJDyzp{J<CBF5a@ocO7b)Z*wL*+}|Q;CWWj
zrwsXTOl`-2{lbm4_4aC{QD21#W`vUOZ5yq|c}Yu(jfick{kvvY;d^A;*7fl^F^PgF
zE^^B^!~Gp+yxT<(CeR103HrJ0mXtZx{Mstpa3KUbTd^we=*bx&JaJD!Z@!Y}PU~=Y
zdbRB<n~K+so^Sdtb;3H|cBsyyNEC){JS_;9-h2%2GXe#C-nl>V*jU?{+%KzW37-<w
zIxz|W)?M=N*&fn)y2~5w)93EBfNNwh20l48!lDyr8yX$0f}}EIl1DR$5qr%_!731?
z$CD!icnK!z*K}sR6?nIEfc0!936D!o&z3O5kerNmqcIhqu>q|d3i&%eooE6C8Z2t2
z9bBL;^fzVhdLxCQh1+Ms5P)ilz9MYFKdqYN%*u^ch(Fq~QJASr5V_=szAKA4Xm5M}
z(Kka%r!noMtz6ZUbjBrJ?Hy&c+mHB{OFQ}=41Irej{0N90`E*~_F1&7Du+zF{Dky)
z+KN|-mmIT`Thcij!{3=ibyIn83<d<OT5i1-IQr8Gr5K-KQg{=u<eGy}mrjL`H+>0G
zN{kI3d`NgUEJ|2If}J!?@w~FV+v?<LU~T-4(VN8gIgL(%C%`HWWR_oWnP(88)n?Ld
zlIP>~tlo8ps3Nl`3^kI)WfZ0|ms6U8HEvD9HIDWkz6`T_QSewYZ<aNGH`0<mTbtl!
zd{>yzkRh)!g~R>!jaR9;K|#82kfE5^;R!~}H4C?q{1AG?O$5kGp)G$f%VML%aPD?{
zG6)*KodSZRXbl8OD=ETxQLJz)KMI7xjArKUNh3@0f|T|75?Yy=pD7056ja0W)O;Td
zCEJ=7q?d|$3rZb+8Cvt6mybV-#1B2}Jai^DOjM2<90tpql|M5tmheg){2NyZR}x3w
zL6u}<C@I$%D3jvZoR+SyE4?bu3pcyFB@NXhKg#9hR{7~GrIcLAx9iQSV5Q1;AK{Gj
zk1*g!!y2C3khozZGr`#B30Bq)E=<n2bt}YHO(!GTj@)dk{Fje=Fs7Ut3j92L^xYtN
z366lMCfoRH4$mmz5vdM3M*6NNpI)kK@Kud@K>F<v61r~o#{W2qEfbe@D=*ZzoQzd&
z88dqcf&%r4`R%4?GNuS@PHU^}sjr5Ndxk7-`{k?|32GhxfEK%Q{Bx0fZ~eQQX3TqE
zL_QJjBtx5jD5%%Ma!%A`-l#mJ+0vL<_k6@t<ki5!a|WjGjpIA9CEAZ%iBBek1qH<@
zU-FHDs|H7>+C-PIzZ56q0x$;mVJXM1V0;F}y9F29ob<j8GOm|9@-)i`{Tr5Bcs*IM
zEZIh~g7x!XkOaf}t4g>51f<S0jw)Y#cApQ22~)Q<Li@*N6!jiIXHhD?d!p!B!F~D`
za*ZgoB7%prLA!KI)Mfu?o+Na4QGH$P@Fe@vKd{ZW6`P-yW7c1s7r2)FC2V5qEH)?U
zn7wq0d!Y0%hZMJkxG<vQApI-r$k}y<$GmzJ`d5H_N2j-i%;<T^@Zy#Vzqc(^RXGA_
zcqt*N%VldsMDJqd3hRUQ_j}a`#7SAiD=PaG@J;_IUL4?LCq9%?^AE5WpG|R8Zc}tw
zKUC@_O{Avf>;;+)t&7l30gloMMHPTuod530FC}j^4#qOJV%5!&e!H9#!N&XQvs5{R
zD_FOomd-uk@?_JiWP%&nQ_myBlM6so1Ffa1aaL7B`!ZTXPg_S%TUS*>M^8iJRj1*~
e{{%>Z1YfTk|3C04d;8A^0$7;Zm{b|L#{L(;l>}-4

literal 0
HcmV?d00001

diff --git a/testProjectAndroidDependentBase/main/res/mipmap-xhdpi/ic_launcher.png b/testProjectAndroidDependentBase/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfa42f0e7b91d006d22352c9ff2f134e504e3c1d
GIT binary patch
literal 4842
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

literal 0
HcmV?d00001

diff --git a/testProjectAndroidDependentBase/main/res/mipmap-xxhdpi/ic_launcher.png b/testProjectAndroidDependentBase/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..324e72cdd7480cb983fa1bcc7ce686e51ef87fe7
GIT binary patch
literal 7718
zcmZ{JWl)?=u<pyEi@VF>?hpbj?h-6mfK3P*Eck~k0Tzeg5-hkABxtZea0_k$f-mlF
z0S@Qqtva`>x}TYzc}9LrO?P#qj+P1@HZ?W?0C;Muih9o&|G$cb@ocx1*PEUJ%~tM}
z901hB;rx4#{@jOHs_MN00ADr$2n+#$yJuJ64gh!x0KlF(07#?(0ENrf7G3D`0EUHz
zisCaq%dJ9dz%zhdRNuG*01nCjDhiPCl@b8xIMfv7^t~4jVRrSTGYyZUWqY@yW=)V_
z&3sUP1SK9v1f{4lDSN(agrKYUL<yVg6_sc^i}ous!M&&i%7MgRaC{=sK2;0abwZb(
zK%#g7%=DwbmIhhZ1uZS#${mjO_Sy?&45vP|j(#7Les}nDOs51Pu~%9U`+pdGns~0+
zvNqu*INhiYi7)co_=k)DBQdjb<qb@Mh&`qA6+u!@sx<mwmiS5IqdoYTbB@RKc=`iu
zFpI$KysP|h@dpl|n8LIt5H3%P4_wP=@Jk6z)9xDIZ^ix~f4p|jx)nhraBxr*i)3^-
z4~muiU{HKJ#;5|`?8KQM6U#Y8{u`5dg5snr4rS@9a84t^Qg^eP!%BSOMu}*OH)-D=
zHZE$s{4ICw0T5`CnYRPW$n!L&pr}7lPi92zja4X%-VSv4i_-ZRCLy+QHUb+P;&FUd
z4NJCxZ`p+UW9eahn%8Q#29e8OaUpgEOQT4ydrRCtS<X;UQZiNUhHJeOaE~uPoxwVC
zphKt2{%<Y%>c;#EGDVeU*5b@#MOSY5JBn#QG8<UEJ{pk9>wqxQh+mdR638{mo5f>O
zLUdZIPSjFk0~F26zDrM3y_#P^P91oWtLlPaZrhnM$NR%qsb<kdTT73_8n%q)B+x)v
zl#><sP1_rm*?^2ki-5TCx|7C~4%t%-T+LG1(=pH1#BWbc+n9-bZAobnsBBZA8zr&Y
zx!x2rmGMKKud<=VuG6GPu6>HHK#?fN?cX<IN5>?EvAhY1Sr9A(1;Kw4@87~|;2QP~
z(kKOGvCdB}qr4m#)1DwQFlh^NdBZvNLkld&yg%&GU`+boBMsoj5o?8tVuY^b0?4;E
zsxoLxz8?S$y~a~x0{?dqk+6~Dd(EG7px_yH(X&NX&qEtHPUhu*JHD258=5$JS12rQ
zcN+7p>R>tbFJ3NzEcRIpS98?}YEYxBIA8}1Y8zH9wq0c{hx+<r>EXY&ZQ!-Hvy03X
zLTMo4EZwtKfwb294-cY5XhQRxYJSybphcrNJWW2FY+b?|QB^?$5ZN=JlSs9Og(;8+
z*~-#<Q$_Z<#jC_?kK}U#GC7kzD?l0<*zz}5XXVyjW1wtr)u1|lP$Nq@D|IU65HpYT
z?Bx32f1SNpMQnQ{2TLhSSI7rv{!q<qQY#R;1QiWZFRWIpz&P(wUmdHX)_b4M*5CFY
zKUhT{Ol5*^Mey}(W<J2%ZvLC(`E3MFQ7HxWWsZi#?euwZU%wXhJk&!|g(N0n7EOt{
zKj}L_jsa*{h!gQ-jh_8X*Kc&c-je!BGv|2t*!}b=Ua_WbdS7QR)#Rht842(=l~2N7
z^_=oiI$=`;tVnb-Wtp?|MIHPz9-OQ^afh~b^=)m6Gf*J#WuOgExpKcrbse3a_);k+
zjg@2!CbeDjS%0Xer7k)m-&MQ>CeeEOxt~F#aWn8wy-N_ilDDe_o+SwJD>4y?j5Lpj
z2&!EX)RNxnadPBAa?fOj5D1C{l1E0X?&G3+ckcVfk`?%2FTsoUf4@~eaS#th=zq7v
zMEJR@1T?Pi4;$xiPv`3)9rsrbVUH&b0e2{YTEG%;$GGzKUKEim;R6r>F@Q-}9JR-<
zOPp<K28VTvy^v&=KmVj95BrUzPPwe+N*La!y`jJk9L<7z929cLeqE4e@uQBcsr$95
z4A#R4N)F`!ms|Y49HG5JSMhcci6)GZCBAuOktp@k9e&p<BVBve{bS{AlHp(#d-B`B
zu8_5B|C-f8-EfUDdysA4_zLgUlGiDBiPz!oA~+Yv?WCed27xb8t^@&z7e}Cc0FAe-
zW^9b6`E(AnmTECE^-4btrc`U)I$qi?ao`bN7OrWDd)cf{<FMzXeTef*iUYIT^pd*C
z6aP-c-XtlFmv&~v!s_zFeb0w4*#A)DZ2Q!;*>QI>W0Vt6&7d?~$d&}chKTr_rELu}
zWY;KTvtpJFr?P~ReHL4~2=ABn1`GN4Li%OI_1{mMRQi1Bf?+^Va?xdn4>h)Bq#ZRK
zYo%R_h5etrv|!$1QF8fu80fN?1oXe(Jx#e6H^$+>C}N{*i$bNbELsXDA>cxlh|iFq
zh~$yJ?1lTdcFd1Yv+Hr^PP!yupP!0H@Y6(wFcaVE+0?qjDJ1;*-Q8qL{NNPc{GAoi
z_kBH`kw^(^7ShmzArk^A-!3_$W%!M-pGaZC=K`p-ch&iT%CV0>ofS74aPd7oT&cRr
zXI30fVV6#PR*Z?c*orR0!$K6SUl9!H>hG+%`LdifNk`!Sw7Hon{Wn=|qV{a%v9nEq
zAdBW*5kq6il=yA}x8cZQt^c+RBS|TRn;!?$ue?@jIV~0w1dt1FJRYI-K5>z-^01)R
z)r}A&QXp^?-?}Uj`}ZPqB#}xO-?{0wrmi|eJOEjzdXbey4$rtKNHz)M*o?Ov+;S=K
z-l~`)xV`%7Gvzy5wfvwqc0|80K29k0G~1nuBO+y-6)w11Kz2{>yD{HTt-uybe2pe?
zUZK*Eij7TT4NwF1Jr@6R7gMuu^@qn#zPIgRtF?-SJL8<Mc`S1HdWBuGD-MQ;NWX#n
zm{qA-7zL&H59`ts%}&=jDBO_?vNZgNR$nQqZgq$MxBru(qaKn%d?nu~{ZNVmnu$UO
zouSk~R7vG69vI(!$W-wl^6Z8@_PD%0LRKW>3LBDrh7k#{F^222EXPg}S0d4Lf0!|1
z|2k$^b~)^8$Z-yH{B-vo%7sVU@ZCvXN+Am)-fy$afZ_4HAUpK}j4p`UyXRel-+(VS
z#K>-=-oA1pH+Lo$&|!lYB|M7Y&&bF##Oi@y_G3p1X$0I{jS1!NEdTz#x0`H`d*l%X
z*8Y3>L*>j@ZQGOdPqwY(GzbA4nxqT(UAP<-tBf{_cb&Hn8hO5gEAot<ib?%<<wZhQ
ziMCJ_mGMEZA^3w5hP5ig?N-b=zT{TLnzpU#m`+-c_?M$^#o;H*RfO_HM462pjgE_N
zG#Gq+c%x3W4YvHJOJ5*F;358Z(+1ljalfUrZPYY|Ef;Dk+G5@G!&A)YmCX$+r<wc2
zu%GT&+}E;FdEh9$FH6f=%8PNh9cLV!o#UWw>oV;tF6K4~wr2-M0v|2acQ!E@G*g$J
z)~&_lvwN%WW>@U_taX5YX@a~pnG7A~jGwQwd4)QKk|^d_x9j+3JYmI5H`a)XMKwDt
zk(nmso_I$Kc5m+8iVbIhY<4$34Oz!sg3oZF%UtS(sc6iq3?e8Z;P<{OFU9MACE6y(
zeVprnhr!P;oc8pbE%A~S<+NGI2ZT@4A|o9bByQ0er$rYB3(c)7;=)^?$%a${0@70N
zuiBVnAMd|qX7BE)8})+FAI&HM|BIb3e=e`b{Do8`J0jc$H>gl$zF26=haG31FDaep
zd~i}CHSn$#8|WtE06vcA%1yxiy_TH|RmZ5><NLS&^y_AYS?K?VW;1UnFMF4n({@$(
z?p@gWoiT)*6AP!%hv&M=diya=$(LJ;zWO8;y3FG8t^<w5cl2RbBlUqIs-RAmUZLCr
zw~%p6+u!T9H=%P-GX2%BgHn=oqkD^h8JQd7I43yOO`3q^-B;$>pI5*8pJZk0X5<JX
zPzhTuJ3p5Yr1xZ#7FAe>4JDQQZgIf1Pp3*6hepV_cXe)L2iW$Ov=RZ4T)SP^a_8V}
z+Nl?NJL7fAi<)Gt98U+LhE>x4W=bfo4F>5)qBx@^8&5-b>y*Wq19MyS(72ka8XFr2
zf*j(ExtQkjwN|4<LN%}Kf^okNC-ihciwITU-G_ROn1ukb!(}Xpmq6ZPz^AQEi>B?D
z7+WzS*h6e_Po+Iqc-2n)gTz|de%FcTd_i9n+Y5*Vb=E{8xj&|h`CcUC*(yeCf~#Mf
zzb-_ji&PNcctK6Xhe#gB0skjFFK5C4=k%tQQ}F|ZvEnPcH=#yH4n%z78?McMh!vek
zVzwC0*OpmW2*-A6xz0=pE#WdXHMNxSJ*qGY(RoV9)|eu)HSSi_+<!^qG@+YujLsRX
zef={m?mwCEugQX311;2XXlJ#bn0tC%kny)^<1cWa6ZArj><v`MNB`a(?7VX*!!&ZU
zC2@Wm(3QyFJwNrcYV8L)7w-JAncriOj_Dq@b`d3qquxDdn)pAOh|>|)IgT|!7HRx~
zjM$zp%LEBY)1AKKNI?~*>9DE3<uIa{*RpD5dmDM=(au>Y2<z|M&7DbRzJzaSMGyaQ
zIxKsC9FfpBcbgcaEEU*$P7)$xMwkmR%`gXsG{PrFrUWZD92c1~m=#>t5p#jeqeq`1
zsjA-8eQKC*<BDCvoxoF)<mQ@F7x{0862jCdU!ce^ym)U+OZMkcmk5*<a9tx7VOHE(
zZ2hHB_t%6#Ed8B9zkI!tvW5I2PZ2RgW(oPyr{?hbtiahFtp42&frB7oijss*rA0Th
z;>!$%k#=&jm+JG?UD(}M!tI{wD*3FQFt8jgv2xrRUJ}t}rWx2>XWz9ndH*cxl()ZC
zoq?di!h6HY$fsglgay7|b6$cUG-f!U4blbj(rpP^<skXaJPfo9+Y;IiR%kD&1%JN9
z_h~!02TxF%6ks+v!w(>1ZhHv@Oi~;BBvrv<+uC;%6QK!nyQ!bb3i3D~cvnpDAo3*3
zXRfZ@$J{FP?jf(NY7~-%Kem>jzZ2+LtbG!9I_fdJdD*;^T9gaiY>d+S$EdQrW9W62
z6w8M&v*8VWD_j)fmt?+b<tT}$U#&c}AuLrKYqFo*JP{=4`VrqHox>davPn>oW8djd
zRnQ}{XsIlwYWPp;GWLXvbSZ8#w25z1T}!<{_~(dcR_i1U?hyAe+lL*(Y6c;j2q7l!
zMeN(nuA8Z9$#w2%ETSLjF{A#kE#WKus+%pal;-wx&tTsmFPOcbJtT?j&i(#-rB}l@
zXz|&%MXjD2YcYCZ3h4)?KnC*X$G%5N)1s!0!Ok!F9KLgV@wxMiFJIVH?E5JcwAnZF
zU8ZPDJ_U_l81@&npI5WS7Y@<B5x$8(sXXCK<FjRJ5jbnv342XIFDUN!TFC?_m%9#?
zX?Qg-Ol@{|Qu1V*mw+iVF5n*|_8m@fwA!DAdm?2KExBapdiBT@$<+4`(gBsF)FJ(=
z81+wANd%1^D2<;ZzHp?<(gqHQ&oOxV)JKk76nV1!N%<Q%mb5=kOc(ZYrM#I<)vjW`
z4&;2`O*`*5PKWFB_ppCdjni?*mxOk0f}9SlUSGm<to5<S!88C70}D8R<=p3Mu3F#g
z)qZ+W!mYctYqOcgk3En30(vutGfSl9cwRZv(ziE3Ngp&jfOTR<`Oy67PtpR~rB=Uv
zQvaYqcE|)hO|YUjp(1CnR2lEi@FAb`+O(3i7S>_gf3vTXa;511h_(@{y1q-O{&bzJ
z*8g>?c5=lUH6UfPj3=iuuHf4j?KJPq`x@en2Bp>#zIQjX5(C<9-X<S-*&~X98{MS!
zy5V<7Pa2a}{V$8P<#O493tyZeK$z>4X{<tefnYTi4o-=Ja^L6-S1GZjAP(#XI>a^S
znWF1zJ=7rEUwQ&cZgyV4L12f&2^eIc^dGIJP@ToOgrU_Qe=T)utR;W$_2Vb7NiZ+d
z$I0I>GFIutqOWiLmT~-Q<(?n5QaatHWj**>L8sxh1*pAkwG>siFMGEZYuZ)E!^Hfs
zYBj`sbMQ5MR;6=1^0W*qO*Zthx-svsYqrUbJW)!vTGhWKGEu8c+=Yc%xi}Rncu3ph
zTT1j_>={i3l#~$!rW!%ZtD9e6l6k-k8l{2w53!mmROAD^2yB^e)3f9_Qyf&C#zk`(
z|5RL%r&}#t(;vF4nO&n}`iZpIL=p9tYtYv3%r@GzLWJ6%y_D(icSF^sw<wb@QII*N
zIcL2!PA5BEP?8US(roVgaqO|81u2kaE>YM`e8-n43iwo$C~>G<)dd0ze@5}n(!^YD
zHf#OVbQ$Li@J}-qcOYn_iWF=_%)EXhrVuaYiai<lJG^~V0B<Cr^W<g1jy0+B^NEvb
z4j7#wE;1t5pP@6ZuuWqAzp~*d%RwKi(elkGkLYKyvHVTxR`d+IJ;k9ii3IL=SmPiR
zU`?F*JZ;X)I}^8p?o1y}9kQW{OTY1c>|B<1tXwNsow(m;XfL6^x~|Tr%L3~cs0@c)
zDvOFU-AYn1!A;RBM0S}*EhYK49H$mBAxus)CB*KW(87#!#_C0wDr<0*dZ+GN&(3wR
z6)cFLiDvOfs*-7Q75ekTAx)k!dtENUKHbP|2y4=tf*d_BeZ(9kR*m;dVzm&0fkKuD
zVw5y9N>pz9C_wR+&Ql&&y{4@2M2?fWx~+>f|F%8E@fIfvSM$Dsk26(UL32oNvTR;M
zE?F<7<;;jR<uOuy-9nF@B!%2`b_os1B|(_zjGAz)D3AEc(M#lki>4)ChzQaN((foV
z)XqautTdMYtv<=oo-3W-t|gN7Q43N~%fnClny|NNcW9bIPPP5KK7_N8g!LB8{mK#!
zH$74|$b4TAy@hAZ!;irT2?^B0kZ)7Dc?(7xawRUpO~AmA#}eX9A>+BA7{oDi)LA?F
ze&CT`Cu_2=;8CWI)e~I_65cUmMPw5fqY1^6v))pc_TBArvAw_<e}Qyu^@fep4O3_(
z-zOq;K=Ngx`#h`ZvVmAbD8$SWFMtp|t4U4EJGEuTG|#Xk<y4M59W>5Y8v0+fFFT`T
zHP3&PYi2>CDO=a|@`asXnwe>W80%%<>JPo(DS}IQiBEBaNN0EF6HQ1L2i6GOPMOdN
zjf3EMN!E(ceXhpd8~<6;6k<?WhixDF?(iH52fr=nn}$0p^RTM2`XP%JVi1uYB+dv_
zV-aHGJtI`D<;rrb0)7u%N|RoEM7%V}mACp#7)hd|9<N5OLJ&4o8~H}WM-!`%phBY}
zPVV-1tPaK{g~UjrYz0eowyYtG2gu><57OFRs;mpFM6VviPN>p3?NxrpNs0>K&nH_s
ze)2#HhR9JHPAXf#viTkbc{-5C7U`N!`>J-$T!T6%=xo-)1_WO=+BG{J<tays^6Bj!
zolW}A2d#T#O`J-tar-yZI8ue^u~T1^*Bf7Y$d+ABv<m#1hHVN9S;Y4voy7-uE2Amn
z`+1hRGJdvgmL*^6_Tz;4Xkc;}8ZC7RBUpy&$yLS5D58drSy?9QJ8v?wq(tfLY3#If
zQvX=H?s0wP`Q_^+xhK@N-O#=lE_y+)xc~G5qV!TmE?Yy;XjUbwZxV-E6Jo!$gGJjf
zx!25nE)H>`iIk%tvxF39rJtK49Kj#ne;WG1JF1h7;~wauZ)nMvmBa2PPfrqREMKWX
z@v}$0&+|nJrAAfRY-%?hS4+$B%DNMzBb_=Hl*i%euVLI5Ts~UsBVi(QHyKQ2LMXf`
z0W+~Kz7$t#MuN|X2BJ(M=xZDRAyTLhPvC8i&<D3c^WV+#&^K5y+Vx@WW)IO#sY2=`
z)3YSC2qG+<zf|g~R-(rRvk^0-?IhO*lbwwZ<=HDW{Bu=JQMhZc&H!H@hETzc_YHKv
zRjp=~3-pV>9b=rS-T{k34X}|t+FMqf5gwQirD~N1!kK&^#+#8WvcfENOLA`Mcy@u~
zH10E=t+W=Q;gn}&;`R1D$n(8@Nd6f)9=F%l?A>?2w)H}O4avWOP@7IMVRjQ&aQDb)
zzj{)MTY~Nk78>B!^Eb<GsbB_HW!Ul2ZmP!MyQ|UOCG(GNTbe0-r?X_qO&tReiU~0l
z|C{9h0OrKKma|Tal34KRG%F!yfp{qN4i=$hp6rpEg!!B;qxcXLffx%ed$E0zQyh~v
z^(~+OUwZL<uLf@G|Hy}`w0@%DOH_4*^WR*uM0kM&`!2j(-vothM&6qhi{wt>pT{&h
zy{wTABQlVVQG<4;UHY?;#Je#-E;cF3gVTx520^#XjvTlEX>+s{?KP#Rh@hM6R;~DE
zaQY16$Axm5ycukte}4FtY-VZHc>=Ps8mJDLx3mwVvcF<^`Y6)v5tF`RMXhW1kE-;!
z7~tpIQvz5a6~q-8@hTfF9`J;$QGQN%+VF#`>F4K3>h!tFU^L2jEagQ5Pk1U_I5&B>
z+i<8EMFGFO$f7Z?pzI(jT0QkKnV)gw=j74h4*jfkk3UsUT5PemxD`pO^Y#~;P2Cte
zzZ^pr>SQHC-576SI{p&FRy36<`&{Iej&&A&%>3-L{h(fUbGnb)*b&eaXj>i>gzllk
zLXjw`pp#|yQIQ@;?mS=O-1Tj+ZLzy+aqr7%QwWl?j=*6dw5&4}>!wXqh&j%NuF{1q
zzx$OXeWiAue+g#nkqQ#Uej@Zu;D+@z^VU*&HuNqqEm?V~(Z%7D`W5KSy^e|yF6kM7
z8Z9fEpcs^ElF9Vnolfs7^4b0fsNt+i?LwUX8Cv|iJeR|GOiFV!JyHdq+XQ<?TmNp;
zk=qX)9>&dER(KSqMxW{=M)lA?Exe&ZEB~6SmHg`zkcD7x#myq0h61+zhLr_NzEIjX
zr~NGX_Uh~gdcrvjGI(&5K_zaEf}1t*)v3uT>~Gi$r^}R;H+0FEE5El{y;&DniH2@A
z@!71_8mFHt1#V8MVsIYn={v&*0;3SWf4M$yLB^BdewOxz;Q=+gakk`S{_R_t!z2b|
z+0d<QLl{$J)Jk&<JSywGG~<V+59QQ&3wg5xud86xCw!WCv9BYn<mi*Akn4W2w-Hf3
zlo=HJE*rHN7(Rgy10c>^C?G&7U6$_-W9@eR6SH%+qLx_Tf&Gu5%pn*mOGU0~kv~^K
zhPeqYZMWWoA(Y+4GgQo9nNe6S#MZnyce_na@78ZnpwFenVafZC3N2lc5Jk-@V`{|l
zhaF`zAL)+($xq8mFm{7fXtHru+DANoGz-A^1*@lTnE;1?03lz8kAnD{zQU=Pb^3f`
zT5-g`z5|%qOa!WTBed-8`#AQ~wb9TrUZKU)H*O7!LtNnEd!r8!Oda)u!Gb5P`9(`b
z`lMP6CLh4OzvXC#<EYAg)8}W8EN<Y%HmieCWKj5D>CR|@uo$EcHAyGr=)LB7)>=s3
zvU;aR#cN3<5&CLMFU@keW^R-Tqyf4fdkOnwI(H$x#@I1D6#dkUo@YW#7MU0@=NV-4
zEh2K?O@+2e{qW^7r?B~QTO)j}>hR$q9*n$8M(4+DOZ00WXFonLlk^;os8*zI>YG#?
z9oq$CD~byz>;`--_NMy|iJRALZ#+qV8OXn=AmL^GL&|q1Qw-^*#~;WNNNbk(96Tnw
zGjjscNyIyM2CYwiJ2l-}u_7mUGcvM+puPF^F89eIBx27&$|p_N<UR^kh#Lk?L_3)O
zvUs{rv)oeXpzX^L=nrrLLEMP75fF+JvFpz)s?&$m9}oULO;_F(g3w5v0hv`@94jGs
zi@pNWeG#^@W`qr_*<EnyB3<Q703$*?%!8r3kD&DnPuo%T56|O~1JqpO9G+GGm&Zk!
zWEA8m@xXXmK(A?dZ>G)fOaafGv|_b9G$;1LzZ-1aIE?*R6kHg}dy%~K(Q5S2O6086
z{lN&8;0>!pq^f*Jlh=J%Rmaoed<=uf@$iKl+bieC83IT!09J&IF)9H)C?d!eW<Wk3
ztgK%xQI2}4ijZSd#h0ZPLfoAnQ;{yEa)W%bR2AQ*IX>1UQ}BQwxaqQY47DpOk@`zZ
zo>#SM@oI^|nrWm~Ol7=r`!Bp<LpnHxexq`11UUh_V11R#+#`OJvzVNb0P;0gd@PQR
z;F$s;t;>9lQNbBCeHcfN&X$kjj0R(@?f$OHHt|fWe6jDrYg3(mdEd$8P2Yzjt9*EM
zLE|cp-Tzsdyt(dvLhU8}_IX&I?B=<U%IcwH>|yoZ!&<`9&H5PtApt=VUIB4l0a1NH
v0SQqt3DM`an1p};^>=lX|A*k@Y-MNT^ZzF}9G-1G696?OEyXH%^Pv9$0dR%J

literal 0
HcmV?d00001

diff --git a/testProjectAndroidDependentBase/main/res/values/strings.xml b/testProjectAndroidDependentBase/main/res/values/strings.xml
new file mode 100644
index 00000000..64cb312d
--- /dev/null
+++ b/testProjectAndroidDependentBase/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">GrpcHelloworldExample</string>
+</resources>
diff --git a/testProjectAndroidDependentBase/proguard-rules.pro b/testProjectAndroidDependentBase/proguard-rules.pro
new file mode 100644
index 00000000..c63aefd2
--- /dev/null
+++ b/testProjectAndroidDependentBase/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/thagikura/android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build_base.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/testProjectAndroidDependentBase/test/proto/unittest.proto b/testProjectAndroidDependentBase/test/proto/unittest.proto
new file mode 100644
index 00000000..5c1503ea
--- /dev/null
+++ b/testProjectAndroidDependentBase/test/proto/unittest.proto
@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+option java_package = "com.example.tutorial";
+option java_outer_classname = "OuterLocalTest";
+option java_multiple_files = true;
+
+// From the main sourceSet
+import "helloworld.proto";
+
+message UnitTestMsg {
+    string foo = 1;
+    UnitTestSecondMsg blah = 2;
+}
+
+message UnitTestSecondMsg {
+    int32 blah = 1;
+    helloworld.HelloReply reply = 2;
+}
diff --git a/testProjectAndroidLibrary/build.gradle b/testProjectAndroidLibrary/build.gradle
new file mode 100644
index 00000000..26d8eef9
--- /dev/null
+++ b/testProjectAndroidLibrary/build.gradle
@@ -0,0 +1,91 @@
+// This build is not a complete project, but is used to generate a project.
+// See: ProtobufPluginTestHelper.groovy
+buildscript {
+    repositories {
+        maven { url 'https://maven.google.com' }
+        maven { url "https://plugins.gradle.org/m2/" }
+    }
+}
+
+plugins {
+    id 'com.android.library'
+    id 'com.google.protobuf'
+}
+
+repositories {
+    maven { url 'https://maven.google.com' }
+    maven { url "https://plugins.gradle.org/m2/" }
+}
+
+android {
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
+
+    defaultConfig {
+        minSdkVersion 7
+        targetSdkVersion 23
+        versionCode 1
+        versionName "1.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_7
+        targetCompatibility = JavaVersion.VERSION_1_7
+    }
+
+    // https://github.com/square/okio/issues/58
+    lintOptions {
+        warning 'InvalidPackage'
+        abortOnError false
+    }
+
+    dexOptions {
+        javaMaxHeapSize "1g"
+        threadCount 1 // reduce predex thread count to limit memory usage
+    }
+}
+
+protobuf {
+    protoc {
+        artifact = 'com.google.protobuf:protoc:3.0.0'
+    }
+    plugins {
+        grpc {
+            artifact = 'io.grpc:protoc-gen-grpc-java:1.0.0-pre2'
+        }
+        javalite {
+            artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
+        }
+    }
+    generateProtoTasks {
+        all()*.plugins {
+            javalite { }
+        }
+        ofNonTest()*.plugins {
+            grpc {
+                // Options added to --grpc_out
+                option 'lite'
+            }
+        }
+    }
+}
+
+dependencies {
+    compile 'javax.annotation:javax.annotation-api:1.2'
+    compile 'com.google.protobuf:protobuf-lite:3.0.0'
+    compile 'io.grpc:grpc-core:1.0.0-pre2'
+    compile 'io.grpc:grpc-stub:1.0.0-pre2'
+    compile 'io.grpc:grpc-okhttp:1.0.0-pre2'
+    compile('io.grpc:grpc-protobuf-lite:1.0.0-pre2') {
+        // Otherwise Android compile will complain "Multiple dex files define ..."
+        exclude module: "protobuf-lite"
+    }
+    testCompile 'junit:junit:4.12'
+}
\ No newline at end of file
diff --git a/testProjectAndroidLibrary/settings.gradle b/testProjectAndroidLibrary/settings.gradle
new file mode 100644
index 00000000..eed2f32b
--- /dev/null
+++ b/testProjectAndroidLibrary/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'testProjectAndroidLibrary'
\ No newline at end of file
diff --git a/testProjectAndroidLibrary/src/main/AndroidManifest.xml b/testProjectAndroidLibrary/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..35f2c1b3
--- /dev/null
+++ b/testProjectAndroidLibrary/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="io.dont.build.me" >
+  <application />
+</manifest>
\ No newline at end of file
diff --git a/testProjectAndroidLibrary/src/main/proto/messages.proto b/testProjectAndroidLibrary/src/main/proto/messages.proto
new file mode 100644
index 00000000..809224c1
--- /dev/null
+++ b/testProjectAndroidLibrary/src/main/proto/messages.proto
@@ -0,0 +1,138 @@
+
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Message definitions to be used by integration test service definitions.
+
+syntax = "proto3";
+
+package grpc.testing;
+
+option java_package = "io.grpc.testing.integration";
+
+// The type of payload that should be returned.
+enum PayloadType {
+  // Compressable text format.
+  COMPRESSABLE = 0;
+
+  // Uncompressable binary format.
+  UNCOMPRESSABLE = 1;
+
+  // Randomly chosen from all other formats defined in this enum.
+  RANDOM = 2;
+}
+
+// A block of data, to simply increase gRPC message size.
+message Payload {
+  // The type of data in body.
+  PayloadType type = 1;
+  // Primary contents of payload.
+  bytes body = 2;
+}
+
+// Unary request.
+message SimpleRequest {
+  // Desired payload type in the response from the server.
+  // If response_type is RANDOM, server randomly chooses one from other formats.
+  PayloadType response_type = 1;
+
+  // Desired payload size in the response from the server.
+  // If response_type is COMPRESSABLE, this denotes the size before compression.
+  int32 response_size = 2;
+
+  // Optional input payload sent along with the request.
+  Payload payload = 3;
+
+  // Whether SimpleResponse should include username.
+  bool fill_username = 4;
+
+  // Whether SimpleResponse should include OAuth scope.
+  bool fill_oauth_scope = 5;
+}
+
+// Unary response, as configured by the request.
+message SimpleResponse {
+  // Payload to increase message size.
+  Payload payload = 1;
+  // The user the request came from, for verifying authentication was
+  // successful when the client expected it.
+  string username = 2;
+  // OAuth scope.
+  string oauth_scope = 3;
+}
+
+message SimpleContext {
+  string value = 1;
+}
+
+// Client-streaming request.
+message StreamingInputCallRequest {
+  // Optional input payload sent along with the request.
+  Payload payload = 1;
+
+  // Not expecting any payload from the response.
+}
+
+// Client-streaming response.
+message StreamingInputCallResponse {
+  // Aggregated size of payloads received from the client.
+  int32 aggregated_payload_size = 1;
+}
+
+// Configuration for a particular response.
+message ResponseParameters {
+  // Desired payload sizes in responses from the server.
+  // If response_type is COMPRESSABLE, this denotes the size before compression.
+  int32 size = 1;
+
+  // Desired interval between consecutive responses in the response stream in
+  // microseconds.
+  int32 interval_us = 2;
+}
+
+// Server-streaming request.
+message StreamingOutputCallRequest {
+  // Desired payload type in the response from the server.
+  // If response_type is RANDOM, the payload from each response in the stream
+  // might be of different types. This is to simulate a mixed type of payload
+  // stream.
+  PayloadType response_type = 1;
+
+  // Configuration for each expected response message.
+  repeated ResponseParameters response_parameters = 2;
+
+  // Optional input payload sent along with the request.
+  Payload payload = 3;
+}
+
+// Server-streaming response, as configured by the request and parameters.
+message StreamingOutputCallResponse {
+  // Payload to increase response size.
+  Payload payload = 1;
+}

From 540334c28859d6887dc683e48a5c6487774e093b Mon Sep 17 00:00:00 2001
From: Chengyuan Zhang <chengyuanzhang@google.com>
Date: Tue, 3 Nov 2020 02:20:52 -0800
Subject: [PATCH 02/10] Add test case for building android application with
 importing protos included in the depending android library.

---
 .../gradle/ProtobufAndroidPluginTest.groovy   | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/test/groovy/com/google/protobuf/gradle/ProtobufAndroidPluginTest.groovy b/src/test/groovy/com/google/protobuf/gradle/ProtobufAndroidPluginTest.groovy
index 20f47a09..cf04932b 100644
--- a/src/test/groovy/com/google/protobuf/gradle/ProtobufAndroidPluginTest.groovy
+++ b/src/test/groovy/com/google/protobuf/gradle/ProtobufAndroidPluginTest.groovy
@@ -110,6 +110,34 @@ class ProtobufAndroidPluginTest extends Specification {
     gradleVersion << GRADLE_VERSION.takeRight(1)
   }
 
+  @Unroll
+  void "testProjectAndroidDependent [android #agpVersion, gradle #gradleVersion, kotlin #kotlinVersion]"() {
+    given: "project from testProjectAndroidLibrary, testProjectAndroid"
+    File testProjectLibrary = ProtobufPluginTestHelper.projectBuilder('testProjectAndroidLibrary')
+            .copyDirs('testProjectAndroidLibrary')
+            .build()
+    File testProjectAndroid = ProtobufPluginTestHelper.projectBuilder('testProjectAndroid')
+            .copyDirs('testProjectAndroidDependentBase', 'testProjectAndroid')
+            .build()
+    File mainProjectDir = ProtobufPluginTestHelper.projectBuilder('testProjectAndroidDependentMain')
+            .copySubProjects(testProjectLibrary, testProjectAndroid)
+            .withAndroidPlugin(agpVersion)
+            .build()
+    when: "build is invoked"
+    BuildResult result = buildAndroidProject(
+            mainProjectDir,
+            gradleVersion,
+            "testProjectAndroid:build"
+    )
+
+    then: "it succeed"
+    result.task(":testProjectAndroid:build").outcome == TaskOutcome.SUCCESS
+
+    where:
+    agpVersion << ANDROID_PLUGIN_VERSION
+    gradleVersion << GRADLE_VERSION
+  }
+
   @Unroll
   void "testProjectAndroidKotlin [android #agpVersion, gradle #gradleVersion, kotlin #kotlinVersion]"() {
     given: "project from testProject, testProjectLite & testProjectAndroid"

From 360c453aa85f8327af9861eee6faf92770fd162a Mon Sep 17 00:00:00 2001
From: Chengyuan Zhang <chengyuanzhang@google.com>
Date: Tue, 10 Nov 2020 12:31:12 -0800
Subject: [PATCH 03/10] Fix template project structure.

---
 .../androidTest/proto/sample.proto            |  18 ------------------
 .../{ => src}/main/AndroidManifest.xml        |   0
 .../{ => src}/main/proto/helloworld.proto     |   0
 .../main/res/layout/activity_helloworld.xml   |   0
 .../main/res/mipmap-hdpi/ic_launcher.png      | Bin
 .../main/res/mipmap-mdpi/ic_launcher.png      | Bin
 .../main/res/mipmap-xhdpi/ic_launcher.png     | Bin
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin
 .../{ => src}/main/res/values/strings.xml     |   0
 .../{ => src}/test/proto/unittest.proto       |   0
 10 files changed, 18 deletions(-)
 delete mode 100644 testProjectAndroidDependentBase/androidTest/proto/sample.proto
 rename testProjectAndroidDependentBase/{ => src}/main/AndroidManifest.xml (100%)
 rename testProjectAndroidDependentBase/{ => src}/main/proto/helloworld.proto (100%)
 rename testProjectAndroidDependentBase/{ => src}/main/res/layout/activity_helloworld.xml (100%)
 rename testProjectAndroidDependentBase/{ => src}/main/res/mipmap-hdpi/ic_launcher.png (100%)
 rename testProjectAndroidDependentBase/{ => src}/main/res/mipmap-mdpi/ic_launcher.png (100%)
 rename testProjectAndroidDependentBase/{ => src}/main/res/mipmap-xhdpi/ic_launcher.png (100%)
 rename testProjectAndroidDependentBase/{ => src}/main/res/mipmap-xxhdpi/ic_launcher.png (100%)
 rename testProjectAndroidDependentBase/{ => src}/main/res/values/strings.xml (100%)
 rename testProjectAndroidDependentBase/{ => src}/test/proto/unittest.proto (100%)

diff --git a/testProjectAndroidDependentBase/androidTest/proto/sample.proto b/testProjectAndroidDependentBase/androidTest/proto/sample.proto
deleted file mode 100644
index 70d912cb..00000000
--- a/testProjectAndroidDependentBase/androidTest/proto/sample.proto
+++ /dev/null
@@ -1,18 +0,0 @@
-syntax = "proto3";
-
-option java_package = "com.example.tutorial";
-option java_outer_classname = "OuterSample";
-option java_multiple_files = true;
-
-// From the main sourceSet
-import "helloworld.proto";
-
-message Msg {
-    string foo = 1;
-    SecondMsg blah = 2;
-}
-
-message SecondMsg {
-    int32 blah = 1;
-    helloworld.HelloReply reply = 2;
-}
diff --git a/testProjectAndroidDependentBase/main/AndroidManifest.xml b/testProjectAndroidDependentBase/src/main/AndroidManifest.xml
similarity index 100%
rename from testProjectAndroidDependentBase/main/AndroidManifest.xml
rename to testProjectAndroidDependentBase/src/main/AndroidManifest.xml
diff --git a/testProjectAndroidDependentBase/main/proto/helloworld.proto b/testProjectAndroidDependentBase/src/main/proto/helloworld.proto
similarity index 100%
rename from testProjectAndroidDependentBase/main/proto/helloworld.proto
rename to testProjectAndroidDependentBase/src/main/proto/helloworld.proto
diff --git a/testProjectAndroidDependentBase/main/res/layout/activity_helloworld.xml b/testProjectAndroidDependentBase/src/main/res/layout/activity_helloworld.xml
similarity index 100%
rename from testProjectAndroidDependentBase/main/res/layout/activity_helloworld.xml
rename to testProjectAndroidDependentBase/src/main/res/layout/activity_helloworld.xml
diff --git a/testProjectAndroidDependentBase/main/res/mipmap-hdpi/ic_launcher.png b/testProjectAndroidDependentBase/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from testProjectAndroidDependentBase/main/res/mipmap-hdpi/ic_launcher.png
rename to testProjectAndroidDependentBase/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/testProjectAndroidDependentBase/main/res/mipmap-mdpi/ic_launcher.png b/testProjectAndroidDependentBase/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from testProjectAndroidDependentBase/main/res/mipmap-mdpi/ic_launcher.png
rename to testProjectAndroidDependentBase/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/testProjectAndroidDependentBase/main/res/mipmap-xhdpi/ic_launcher.png b/testProjectAndroidDependentBase/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from testProjectAndroidDependentBase/main/res/mipmap-xhdpi/ic_launcher.png
rename to testProjectAndroidDependentBase/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/testProjectAndroidDependentBase/main/res/mipmap-xxhdpi/ic_launcher.png b/testProjectAndroidDependentBase/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from testProjectAndroidDependentBase/main/res/mipmap-xxhdpi/ic_launcher.png
rename to testProjectAndroidDependentBase/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/testProjectAndroidDependentBase/main/res/values/strings.xml b/testProjectAndroidDependentBase/src/main/res/values/strings.xml
similarity index 100%
rename from testProjectAndroidDependentBase/main/res/values/strings.xml
rename to testProjectAndroidDependentBase/src/main/res/values/strings.xml
diff --git a/testProjectAndroidDependentBase/test/proto/unittest.proto b/testProjectAndroidDependentBase/src/test/proto/unittest.proto
similarity index 100%
rename from testProjectAndroidDependentBase/test/proto/unittest.proto
rename to testProjectAndroidDependentBase/src/test/proto/unittest.proto

From 2536eba171e31d97883220ab845b3051dd517453 Mon Sep 17 00:00:00 2001
From: Chengyuan Zhang <chengyuanzhang@google.com>
Date: Tue, 10 Nov 2020 12:32:21 -0800
Subject: [PATCH 04/10] Add more files to template project.

---
 .../lib/protos.jar                            | Bin 0 -> 269 bytes
 .../src/androidTest/proto/sample.proto        |  18 ++++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 testProjectAndroidDependentBase/lib/protos.jar
 create mode 100644 testProjectAndroidDependentBase/src/androidTest/proto/sample.proto

diff --git a/testProjectAndroidDependentBase/lib/protos.jar b/testProjectAndroidDependentBase/lib/protos.jar
new file mode 100644
index 0000000000000000000000000000000000000000..18f117dbd896c0d122afc603ba3ba081cccc9720
GIT binary patch
literal 269
zcmWIWW@Zs#U|`^2nC1J=?a+jV+tEN?1`zWx$S|Z<l%y8rCFbZA6y=xXhlX%6Ft>#4
z3I*ZP3T_5Q7I$_g29^$C1_teQXS6-n1Z)Tm(9$@if6_c`)3Zlf9zN&%eEdT_&Yi#N
zeg3@vdC#lN-fB~qy<94;x{Tqc>dK?44pVooJbF}Ns-NXg&wT-9rqi38f>Z+<oxGAf
zl`f<>XRnLWV+inOWRhdX<wyyjQyCZ-fp|e9h=uNCR)~|)oEzZH$_7%+2!tU(dNGK@
F003lEPiO!D

literal 0
HcmV?d00001

diff --git a/testProjectAndroidDependentBase/src/androidTest/proto/sample.proto b/testProjectAndroidDependentBase/src/androidTest/proto/sample.proto
new file mode 100644
index 00000000..70d912cb
--- /dev/null
+++ b/testProjectAndroidDependentBase/src/androidTest/proto/sample.proto
@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+option java_package = "com.example.tutorial";
+option java_outer_classname = "OuterSample";
+option java_multiple_files = true;
+
+// From the main sourceSet
+import "helloworld.proto";
+
+message Msg {
+    string foo = 1;
+    SecondMsg blah = 2;
+}
+
+message SecondMsg {
+    int32 blah = 1;
+    helloworld.HelloReply reply = 2;
+}

From e22b60e4f130c3fc3e1e47002dfe3ba5373ca4ad Mon Sep 17 00:00:00 2001
From: Chengyuan Zhang <chengyuanzhang@google.com>
Date: Tue, 10 Nov 2020 12:33:22 -0800
Subject: [PATCH 05/10] Fix extractIncludeProto task, it should be bound to
 each Andriod variant instead of source set.

---
 .../protobuf/gradle/ProtobufPlugin.groovy     | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy b/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
index a824914a..0449c863 100644
--- a/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
+++ b/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
@@ -38,6 +38,7 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.artifacts.Configuration
+import org.gradle.api.attributes.Attribute
 import org.gradle.api.attributes.LibraryElements
 import org.gradle.api.file.FileCollection
 import org.gradle.api.file.SourceDirectorySet
@@ -275,19 +276,35 @@ class ProtobufPlugin implements Plugin<Project> {
       }
       generateProtoTask.doneInitializing()
 
+      Attribute artifactType = Attribute.of("artifactType", String)
+      String name = variant.name
+      FileCollection classPathConfig = variant.compileConfiguration.incoming.artifactView {
+        attributes {
+            it.attribute(artifactType, "jar")
+        }
+      }.files
+      FileCollection testClassPathConfig =
+          variant.hasProperty("testedVariant") ?
+            variant.testedVariant.compileConfiguration.incoming.artifactView {
+                attributes {
+                    it.attribute(artifactType, "jar")
+                }
+            }.files : null
+      setupExtractIncludeProtosTask(generateProtoTask, name, classPathConfig, testClassPathConfig)
+
+      // Include source proto files in the compiled archive, so that proto files from
+      // dependent projects can import them.
       if (project.android.hasProperty('libraryVariants')) {
           Task processResourcesTask = variant.getProcessJavaResourcesProvider().get()
           processResourcesTask.from(generateProtoTask.sourceFiles) {
               include '**/*.proto'
           }
           variant.sourceSets.each {
-              setupExtractIncludeProtosTask(generateProtoTask, it.name)
               Task extractTask = setupExtractProtosTask(generateProtoTask, it.name)
               processResourcesTask.dependsOn(extractTask)
           }
       } else {
           variant.sourceSets.each {
-              setupExtractIncludeProtosTask(generateProtoTask, it.name)
               setupExtractProtosTask(generateProtoTask, it.name)
           }
       }

From eb0a43de9e7dac82dbee4776c8e831d2737d625c Mon Sep 17 00:00:00 2001
From: Chengyuan Zhang <chengyuanzhang@google.com>
Date: Sun, 15 Nov 2020 14:50:02 -0800
Subject: [PATCH 06/10] Fix message java package name for testing.

---
 testProjectAndroidLibrary/src/main/proto/messages.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testProjectAndroidLibrary/src/main/proto/messages.proto b/testProjectAndroidLibrary/src/main/proto/messages.proto
index 809224c1..0c03c399 100644
--- a/testProjectAndroidLibrary/src/main/proto/messages.proto
+++ b/testProjectAndroidLibrary/src/main/proto/messages.proto
@@ -34,7 +34,7 @@ syntax = "proto3";
 
 package grpc.testing;
 
-option java_package = "io.grpc.testing.integration";
+option java_package = "io.grpc.testing";
 
 // The type of payload that should be returned.
 enum PayloadType {

From e1d7f00739aaeef91bdb192fad337407932cadc6 Mon Sep 17 00:00:00 2001
From: Chengyuan Zhang <chengyuanzhang@google.com>
Date: Sun, 15 Nov 2020 15:03:41 -0800
Subject: [PATCH 07/10] Fix the source of dependency proto used by test
 messages.

---
 .../androidTest/java/io/grpc/helloworldexample/TestLibrary.java | 2 +-
 .../src/test/java/io/grpc/helloworldexample/UnitTest.java       | 2 +-
 testProjectAndroidDependentBase/src/main/proto/helloworld.proto | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/testProjectAndroid/src/androidTest/java/io/grpc/helloworldexample/TestLibrary.java b/testProjectAndroid/src/androidTest/java/io/grpc/helloworldexample/TestLibrary.java
index 51d02bd6..074a225a 100644
--- a/testProjectAndroid/src/androidTest/java/io/grpc/helloworldexample/TestLibrary.java
+++ b/testProjectAndroid/src/androidTest/java/io/grpc/helloworldexample/TestLibrary.java
@@ -9,7 +9,7 @@ public class TestLibrary {
   // From src/main/proto/helloworld.proto
   Helloworld.HelloRequest request;
 
-  // From testProjectLite: src/nano/proto/messages.proto
+  // From dependency project (testProjectLite/testProjectAndroidLibrary): src/proto/messages.proto
   io.grpc.testing.Messages.SimpleRequest simpleRequest;
 
   // From lib/protos.jar
diff --git a/testProjectAndroid/src/test/java/io/grpc/helloworldexample/UnitTest.java b/testProjectAndroid/src/test/java/io/grpc/helloworldexample/UnitTest.java
index 3c0c0322..1a3114ef 100644
--- a/testProjectAndroid/src/test/java/io/grpc/helloworldexample/UnitTest.java
+++ b/testProjectAndroid/src/test/java/io/grpc/helloworldexample/UnitTest.java
@@ -15,7 +15,7 @@ public final class UnitTest {
   // From src/main/proto/helloworld.proto
   private Helloworld.HelloRequest request;
 
-  // From testProjectLite: src/nano/proto/messages.proto
+  // From dependency project (testProjectLite/testProjectAndroidLibrary): src/proto/messages.proto
   private io.grpc.testing.Messages.SimpleRequest simpleRequest;
 
   // From lib/protos.jar
diff --git a/testProjectAndroidDependentBase/src/main/proto/helloworld.proto b/testProjectAndroidDependentBase/src/main/proto/helloworld.proto
index 8de3aa8e..ad69b84c 100644
--- a/testProjectAndroidDependentBase/src/main/proto/helloworld.proto
+++ b/testProjectAndroidDependentBase/src/main/proto/helloworld.proto
@@ -29,7 +29,7 @@
 
 syntax = "proto3";
 
-// From testProject: src/nano/proto
+// From testProjectAndroidLibrary: src/proto
 import "messages.proto";
 
 option java_package = "io.grpc.helloworldexample";

From 91ebdb2c4252f75df8de1e649cf346fb8b1a227e Mon Sep 17 00:00:00 2001
From: Chengyuan Zhang <chengyuanzhang@google.com>
Date: Sun, 15 Nov 2020 16:03:59 -0800
Subject: [PATCH 08/10] Fix included proto extraction, use each variant's
 compileConfiguration as the source of dependencies that protos to be
 extracted from.

---
 .../protobuf/gradle/ProtobufPlugin.groovy     | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy b/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
index 0449c863..ed576d90 100644
--- a/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
+++ b/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
@@ -131,8 +131,15 @@ class ProtobufPlugin implements Plugin<Project> {
         project.afterEvaluate {
           // All custom source sets, configurations created by other plugins,
           // and Android variants are only available at this point.
-          getSourceSets().each { sourceSet ->
-            createCompileProtoPathConfiguration(sourceSet.name)
+
+          // Java projects will extract included protos from a 'compileProtoPath'
+          // configuration of each source set, while Android projects will
+          // extract included protos from {@code variant.compileConfiguration}
+          // of each variant.
+          if (!Utils.isAndroidProject(project)) {
+            getSourceSets().each { sourceSet ->
+                createCompileProtoPathConfiguration(sourceSet.name)
+            }
           }
           addProtoTasks()
           project.protobuf.runTaskConfigClosures()
@@ -174,6 +181,7 @@ class ProtobufPlugin implements Plugin<Project> {
      * The extract-include-protos task of each source set will extract protobuf files from
      * dependencies in this configuration.
      *
+     * <p> For Java projects only.
      * <p> This works around 'java-library' plugin not exposing resources to consumers for compilation.
      */
     private void createCompileProtoPathConfiguration(String sourceSetName) {
@@ -268,6 +276,7 @@ class ProtobufPlugin implements Plugin<Project> {
      * Creates Protobuf tasks for a variant in an Android project.
      */
     private void addTasksForVariant(final Object variant, boolean isTestVariant) {
+      // GenerateProto task, one per variant (compilation unit).
       Task generateProtoTask = addGenerateProtoTask(variant.name, variant.sourceSets)
       generateProtoTask.setVariant(variant, isTestVariant)
       generateProtoTask.flavors = ImmutableList.copyOf(variant.productFlavors.collect { it.name } )
@@ -276,8 +285,9 @@ class ProtobufPlugin implements Plugin<Project> {
       }
       generateProtoTask.doneInitializing()
 
+      // ExtractIncludeProto task, one per variant (compilation unit).
+      // Proto definitions from an AAR dependencies are in its JAR resources.
       Attribute artifactType = Attribute.of("artifactType", String)
-      String name = variant.name
       FileCollection classPathConfig = variant.compileConfiguration.incoming.artifactView {
         attributes {
             it.attribute(artifactType, "jar")
@@ -290,11 +300,12 @@ class ProtobufPlugin implements Plugin<Project> {
                     it.attribute(artifactType, "jar")
                 }
             }.files : null
-      setupExtractIncludeProtosTask(generateProtoTask, name, classPathConfig, testClassPathConfig)
+      setupExtractIncludeProtosTask(generateProtoTask, variant.name, classPathConfig, testClassPathConfig)
 
-      // Include source proto files in the compiled archive, so that proto files from
-      // dependent projects can import them.
+      // ExtractProto task, one per source set.
       if (project.android.hasProperty('libraryVariants')) {
+          // Include source proto files in the compiled archive, so that proto files from
+          // dependent projects can import them.
           Task processResourcesTask = variant.getProcessJavaResourcesProvider().get()
           processResourcesTask.from(generateProtoTask.sourceFiles) {
               include '**/*.proto'
@@ -401,7 +412,7 @@ class ProtobufPlugin implements Plugin<Project> {
             // dependencies.
             if (Utils.isTest(sourceSetOrVariantName)) {
               inputFiles.from getSourceSets()['main'].proto
-              inputFiles.from testedCompileClasspathConfiguration ?: project.configurations['compile']
+              inputFiles.from testedCompileClasspathConfiguration
             }
           } else {
             // In Java projects, the compileClasspath of the 'test' sourceSet includes all the

From d5f356ca9d8bc5a638e4dc3cc18d3fba7a825daf Mon Sep 17 00:00:00 2001
From: Chengyuan Zhang <chengyuanzhang@google.com>
Date: Sun, 15 Nov 2020 16:18:12 -0800
Subject: [PATCH 09/10] Include testProjectBase to provide assertion for
 compile directory of generated source.

---
 .../protobuf/gradle/ProtobufAndroidPluginTest.groovy     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/test/groovy/com/google/protobuf/gradle/ProtobufAndroidPluginTest.groovy b/src/test/groovy/com/google/protobuf/gradle/ProtobufAndroidPluginTest.groovy
index cf04932b..7ce61573 100644
--- a/src/test/groovy/com/google/protobuf/gradle/ProtobufAndroidPluginTest.groovy
+++ b/src/test/groovy/com/google/protobuf/gradle/ProtobufAndroidPluginTest.groovy
@@ -113,14 +113,17 @@ class ProtobufAndroidPluginTest extends Specification {
   @Unroll
   void "testProjectAndroidDependent [android #agpVersion, gradle #gradleVersion, kotlin #kotlinVersion]"() {
     given: "project from testProjectAndroidLibrary, testProjectAndroid"
-    File testProjectLibrary = ProtobufPluginTestHelper.projectBuilder('testProjectAndroidLibrary')
+    File testProjectStaging = ProtobufPluginTestHelper.projectBuilder('testProject')
+            .copyDirs('testProjectBase', 'testProject')
+            .build()
+    File testProjectLibraryStaging = ProtobufPluginTestHelper.projectBuilder('testProjectAndroidLibrary')
             .copyDirs('testProjectAndroidLibrary')
             .build()
-    File testProjectAndroid = ProtobufPluginTestHelper.projectBuilder('testProjectAndroid')
+    File testProjectAndroidStaging = ProtobufPluginTestHelper.projectBuilder('testProjectAndroid')
             .copyDirs('testProjectAndroidDependentBase', 'testProjectAndroid')
             .build()
     File mainProjectDir = ProtobufPluginTestHelper.projectBuilder('testProjectAndroidDependentMain')
-            .copySubProjects(testProjectLibrary, testProjectAndroid)
+            .copySubProjects(testProjectStaging, testProjectLibraryStaging, testProjectAndroidStaging)
             .withAndroidPlugin(agpVersion)
             .build()
     when: "build is invoked"

From f6e58c26503301a55d68e03b5ea13094cb95171f Mon Sep 17 00:00:00 2001
From: Chengyuan Zhang <chengyuanzhang@google.com>
Date: Sun, 15 Nov 2020 16:32:51 -0800
Subject: [PATCH 10/10] Enhance the test by diectly import protos defined by
 tested variant's dependency.

---
 .../src/androidTest/proto/sample.proto                       | 5 +++++
 .../src/test/proto/unittest.proto                            | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/testProjectAndroidDependentBase/src/androidTest/proto/sample.proto b/testProjectAndroidDependentBase/src/androidTest/proto/sample.proto
index 70d912cb..f65c60f2 100644
--- a/testProjectAndroidDependentBase/src/androidTest/proto/sample.proto
+++ b/testProjectAndroidDependentBase/src/androidTest/proto/sample.proto
@@ -6,6 +6,8 @@ option java_multiple_files = true;
 
 // From the main sourceSet
 import "helloworld.proto";
+// From tested variant's dependency testProjectAndroidLibrary: src/proto
+import "messages.proto";
 
 message Msg {
     string foo = 1;
@@ -14,5 +16,8 @@ message Msg {
 
 message SecondMsg {
     int32 blah = 1;
+    // Uses message type from helloworld.proto
     helloworld.HelloReply reply = 2;
+    // Uses message type from messages.proto
+    grpc.testing.SimpleContext context = 3;
 }
diff --git a/testProjectAndroidDependentBase/src/test/proto/unittest.proto b/testProjectAndroidDependentBase/src/test/proto/unittest.proto
index 5c1503ea..80533002 100644
--- a/testProjectAndroidDependentBase/src/test/proto/unittest.proto
+++ b/testProjectAndroidDependentBase/src/test/proto/unittest.proto
@@ -6,6 +6,8 @@ option java_multiple_files = true;
 
 // From the main sourceSet
 import "helloworld.proto";
+// From main's dependency testProjectAndroidLibrary: src/proto
+import "messages.proto";
 
 message UnitTestMsg {
     string foo = 1;
@@ -14,5 +16,8 @@ message UnitTestMsg {
 
 message UnitTestSecondMsg {
     int32 blah = 1;
+    // Uses message type from helloworld.proto
     helloworld.HelloReply reply = 2;
+    // Uses message type from messages.proto
+    grpc.testing.SimpleContext context = 3;
 }