Snap for 8426163 from 599cbd6b784405f6a751b91d3bcc9536e4776e69 to mainline-tzdata2-release
Change-Id: I8d8dffdd1890f7890b4a72e33dbacc15061f779b
diff --git a/Android.bp b/Android.bp
index d86573e..3b61d08 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,29 +14,6 @@
//
//
-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: [
@@ -51,17 +28,3 @@
"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 2f1c39c..32d177a 100644
--- a/annotation-stubs/Android.bp
+++ b/annotation-stubs/Android.bp
@@ -13,22 +13,11 @@
// 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 {
+java_library_host {
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 6d0b6b2..68d08f4 100644
--- a/auth/Android.bp
+++ b/auth/Android.bp
@@ -13,15 +13,6 @@
// 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 a512580..833559a 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -14,15 +14,6 @@
//
//
-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 814b17a..d7a89b8 100644
--- a/context/Android.bp
+++ b/context/Android.bp
@@ -14,16 +14,7 @@
//
//
-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 {
+java_library_static {
name: "grpc-java-context",
host_supported: true,
srcs: [
@@ -34,5 +25,4 @@
"guava",
"jsr305",
],
- sdk_version: "current",
}
diff --git a/core/Android.bp b/core/Android.bp
index d563293..ed371b0d 100644
--- a/core/Android.bp
+++ b/core/Android.bp
@@ -13,18 +13,8 @@
// 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 {
+java_library_host {
name: "grpc-java-core",
- host_supported: true,
srcs: [
"src/main/java/io/grpc/*.java",
],
@@ -36,12 +26,10 @@
"jsr305",
"guava",
],
- sdk_version: "current",
}
-java_library {
+java_library_host {
name: "grpc-java-core-inprocess",
- host_supported: true,
srcs: [
"src/main/java/io/grpc/inprocess/*.java",
],
@@ -52,12 +40,10 @@
"jsr305",
"guava",
],
- sdk_version: "current",
}
-java_library {
+java_library_host {
name: "grpc-java-core-internal",
- host_supported: true,
srcs: [
"src/main/java/io/grpc/internal/*.java",
],
@@ -72,23 +58,10 @@
"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 {
+java_library_host {
name: "grpc-java-core-util",
- host_supported: true,
srcs: [
"src/main/java/io/grpc/util/*.java",
],
@@ -98,5 +71,4 @@
"jsr305",
"guava",
],
- sdk_version: "current",
}
diff --git a/netty/shaded/Android.bp b/netty/shaded/Android.bp
index 1902402..5aecf42 100644
--- a/netty/shaded/Android.bp
+++ b/netty/shaded/Android.bp
@@ -19,15 +19,6 @@
// 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 7212a3f..8193d9b 100644
--- a/okhttp/Android.bp
+++ b/okhttp/Android.bp
@@ -13,18 +13,8 @@
// 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 {
+java_library_host {
name: "grpc-java-okhttp",
- host_supported: true,
srcs: [
"third_party/okhttp/main/java/**/*.java",
"src/main/java/**/*.java",
@@ -39,7 +29,6 @@
"guava",
],
static_libs: [
- "okhttp-norepackage",
+ "okhttp",
],
- sdk_version: "current",
}
diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp
index 2a2ed94..a8374f5 100644
--- a/protobuf-lite/Android.bp
+++ b/protobuf-lite/Android.bp
@@ -14,18 +14,8 @@
//
//
-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 {
+java_library_host {
name: "grpc-java-protobuf-lite",
- host_supported: true,
srcs: [
"src/main/java/**/*.java",
],
@@ -33,7 +23,6 @@
"grpc-java-core",
"guava",
"jsr305",
- "libprotobuf-java-lite",
+ "libprotobuf-java-full",
],
- sdk_version: "current",
}
diff --git a/protobuf/Android.bp b/protobuf/Android.bp
index f51c272..3e1d243 100644
--- a/protobuf/Android.bp
+++ b/protobuf/Android.bp
@@ -15,15 +15,6 @@
//
//
-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 466195d..4a56f7e 100644
--- a/stub/Android.bp
+++ b/stub/Android.bp
@@ -14,18 +14,8 @@
//
//
-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 {
+java_library_host {
name: "grpc-java-stub",
- host_supported: true,
srcs: [
"src/main/java/**/*.java",
],
@@ -35,5 +25,4 @@
"guava",
"jsr305",
],
- sdk_version: "current",
}
diff --git a/testing/Android.bp b/testing/Android.bp
index 2d2a1c6..f4c2661 100644
--- a/testing/Android.bp
+++ b/testing/Android.bp
@@ -14,18 +14,8 @@
//
//
-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 {
+java_library_host {
name: "grpc-java-testing",
- host_supported: true,
srcs: [
"src/main/java/io/grpc/testing/*.java",
],
@@ -44,5 +34,4 @@
"truth-prebuilt",
"junit",
],
- sdk_version: "current",
}
