Snap for 7478028 from d0bc3d1bbc83b7138a3d2e533f352d980db3dc64 to mainline-adbd-releaseandroid-mainline-12.0.0_r97android-mainline-12.0.0_r85android-mainline-12.0.0_r68android-mainline-12.0.0_r41android-mainline-12.0.0_r21android-mainline-12.0.0_r1android12-mainline-adbd-release

Change-Id: I665164d77842d9fea4cbd9019d706d3ad6476549

12 files changed, 178 insertions, 12 deletions

diff --git a/Android.bp b/Android.bp
index 3b61d0847..d86573e20 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,29 @@
 //
 //
 
+package {
+    default_applicable_licenses: ["external_grpc-grpc-java_license"],
+}
+
+// Added automatically by a large-scale-change
+//
+// large-scale-change included anything that looked like it might be a license
+// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
+//
+// Please consider removing redundant or irrelevant files from 'license_text:'.
+// See: http://go/android-license-faq
+license {
+    name: "external_grpc-grpc-java_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "LICENSE",
+        "NOTICE.txt",
+    ],
+}
+
 java_library_host {
     name: "grpc-java",
     static_libs: [
@@ -28,3 +51,17 @@ java_library_host {
         "grpc-java-stub",
     ]
 }
+
+java_library {
+    name: "grpc-java-okhttp-client-lite",
+    host_supported: true,
+    static_libs: [
+        "grpc-java-stub",
+        "grpc-java-context",
+        "grpc-java-core",
+        "grpc-java-core-internal",
+        "grpc-java-protobuf-lite",
+        "grpc-java-okhttp",
+    ],
+    sdk_version: "current",
+}
diff --git a/annotation-stubs/Android.bp b/annotation-stubs/Android.bp
index 32d177a81..2f1c39c1b 100644
--- a/annotation-stubs/Android.bp
+++ b/annotation-stubs/Android.bp
@@ -13,11 +13,22 @@
 // limitations under the License.
 //
 
-java_library_host {
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_grpc-grpc-java_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_grpc-grpc-java_license"],
+}
+
+java_library {
     name: "grpc-java-annotation-stubs",
+    host_supported: true,
     srcs: [
         ":grpc-java-annotation-stubs-srcjar",
     ],
+    sdk_version: "current",
 }
 
 gensrcs {
diff --git a/auth/Android.bp b/auth/Android.bp
index 68d08f430..6d0b6b2a4 100644
--- a/auth/Android.bp
+++ b/auth/Android.bp
@@ -13,6 +13,15 @@
 // limitations under the License.
 //
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_grpc-grpc-java_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_grpc-grpc-java_license"],
+}
+
 java_library_host {
     name: "grpc-java-auth",
     srcs: [
diff --git a/compiler/Android.bp b/compiler/Android.bp
index 833559a4f..a51258032 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -14,6 +14,15 @@
 //
 //
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_grpc-grpc-java_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_grpc-grpc-java_license"],
+}
+
 cc_binary_host {
     name: "protoc-gen-grpc-java-plugin",
     srcs: [
diff --git a/context/Android.bp b/context/Android.bp
index d7a89b819..814b17a74 100644
--- a/context/Android.bp
+++ b/context/Android.bp
@@ -14,7 +14,16 @@
 //
 //
 
-java_library_static {
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_grpc-grpc-java_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_grpc-grpc-java_license"],
+}
+
+java_library {
     name: "grpc-java-context",
     host_supported: true,
     srcs: [
@@ -25,4 +34,5 @@ java_library_static {
         "guava",
         "jsr305",
     ],
+    sdk_version: "current",
 }
diff --git a/core/Android.bp b/core/Android.bp
index ed371b0d0..d563293c8 100644
--- a/core/Android.bp
+++ b/core/Android.bp
@@ -13,8 +13,18 @@
 // limitations under the License.
 //
 
-java_library_host {
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_grpc-grpc-java_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_grpc-grpc-java_license"],
+}
+
+java_library {
     name: "grpc-java-core",
+    host_supported: true,
     srcs: [
         "src/main/java/io/grpc/*.java",
     ],
@@ -26,10 +36,12 @@ java_library_host {
         "jsr305",
         "guava",
     ],
+    sdk_version: "current",
 }
 
-java_library_host {
+java_library {
     name: "grpc-java-core-inprocess",
+    host_supported: true,
     srcs: [
         "src/main/java/io/grpc/inprocess/*.java",
     ],
@@ -40,10 +52,12 @@ java_library_host {
         "jsr305",
         "guava",
     ],
+    sdk_version: "current",
 }
 
-java_library_host {
+java_library {
     name: "grpc-java-core-internal",
+    host_supported: true,
     srcs: [
         "src/main/java/io/grpc/internal/*.java",
     ],
@@ -58,10 +72,23 @@ java_library_host {
         "opencensus-java-api",
         "opencensus-java-contrib-grpc-metrics",
     ],
+    target: {
+
+        // For the Android variant, ignore this class since it is optional,
+        // uses javax APIs not available on Android, and is used reflectively
+        // so ignoring it does not affect the functionality of the library.
+        android: {
+            exclude_srcs: [
+                "src/main/java/io/grpc/internal/JndiResourceResolverFactory.java",
+            ],
+        },
+    },
+    sdk_version: "current",
 }
 
-java_library_host {
+java_library {
     name: "grpc-java-core-util",
+    host_supported: true,
     srcs: [
         "src/main/java/io/grpc/util/*.java",
     ],
@@ -71,4 +98,5 @@ java_library_host {
         "jsr305",
         "guava",
     ],
+    sdk_version: "current",
 }
diff --git a/netty/shaded/Android.bp b/netty/shaded/Android.bp
index 5aecf42ba..190240219 100644
--- a/netty/shaded/Android.bp
+++ b/netty/shaded/Android.bp
@@ -19,6 +19,15 @@
 // external dependencies and missing build-system support.
 //
 // WARNING: The artifact version must match the source to avoid runtime issues.
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_grpc-grpc-java_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_grpc-grpc-java_license"],
+}
+
 java_library_host {
     name: "grpc-java-netty-shaded",
     static_libs: [
diff --git a/okhttp/Android.bp b/okhttp/Android.bp
index 8193d9bc4..7212a3f57 100644
--- a/okhttp/Android.bp
+++ b/okhttp/Android.bp
@@ -13,8 +13,18 @@
 // limitations under the License.
 //
 
-java_library_host {
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_grpc-grpc-java_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_grpc-grpc-java_license"],
+}
+
+java_library {
     name: "grpc-java-okhttp",
+    host_supported: true,
     srcs: [
         "third_party/okhttp/main/java/**/*.java",
         "src/main/java/**/*.java",
@@ -29,6 +39,7 @@ java_library_host {
         "guava",
     ],
     static_libs: [
-        "okhttp",
+        "okhttp-norepackage",
     ],
+    sdk_version: "current",
 }
diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp
index a8374f5be..2a2ed945c 100644
--- a/protobuf-lite/Android.bp
+++ b/protobuf-lite/Android.bp
@@ -14,8 +14,18 @@
 //
 //
 
-java_library_host {
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_grpc-grpc-java_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_grpc-grpc-java_license"],
+}
+
+java_library {
     name: "grpc-java-protobuf-lite",
+    host_supported: true,
     srcs: [
         "src/main/java/**/*.java",
     ],
@@ -23,6 +33,7 @@ java_library_host {
         "grpc-java-core",
         "guava",
         "jsr305",
-        "libprotobuf-java-full",
+        "libprotobuf-java-lite",
     ],
+    sdk_version: "current",
 }
diff --git a/protobuf/Android.bp b/protobuf/Android.bp
index 3e1d243f9..f51c27200 100644
--- a/protobuf/Android.bp
+++ b/protobuf/Android.bp
@@ -15,6 +15,15 @@
 //
 //
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_grpc-grpc-java_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_grpc-grpc-java_license"],
+}
+
 java_library_host {
     name: "grpc-java-protobuf",
     srcs: [
diff --git a/stub/Android.bp b/stub/Android.bp
index 4a56f7eef..466195dcf 100644
--- a/stub/Android.bp
+++ b/stub/Android.bp
@@ -14,8 +14,18 @@
 //
 //
 
-java_library_host {
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_grpc-grpc-java_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_grpc-grpc-java_license"],
+}
+
+java_library {
     name: "grpc-java-stub",
+    host_supported: true,
     srcs: [
         "src/main/java/**/*.java",
     ],
@@ -25,4 +35,5 @@ java_library_host {
         "guava",
         "jsr305",
     ],
+    sdk_version: "current",
 }
diff --git a/testing/Android.bp b/testing/Android.bp
index f4c26615a..2d2a1c6d4 100644
--- a/testing/Android.bp
+++ b/testing/Android.bp
@@ -14,8 +14,18 @@
 //
 //
 
-java_library_host {
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_grpc-grpc-java_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_grpc-grpc-java_license"],
+}
+
+java_library {
     name: "grpc-java-testing",
+    host_supported: true,
     srcs: [
         "src/main/java/io/grpc/testing/*.java",
     ],
@@ -34,4 +44,5 @@ java_library_host {
         "truth-prebuilt",
         "junit",
     ],
+    sdk_version: "current",
 }