diff options
author | Bob Badour <bbadour@google.com> | 2021-02-16 19:41:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 19:41:21 +0000 |
commit | 5dfd2a12a7a6324c5a129983991f44fbc9baab14 (patch) | |
tree | 342002c39fac0adbfbca05420258c5bcdfa74fd4 | |
parent | d37868eb6506c69f9290b99cd3c06576385a8831 (diff) | |
parent | a198509f05141d550cef0cb94a4996c122a5b533 (diff) | |
download | grpc-grpc-java-5dfd2a12a7a6324c5a129983991f44fbc9baab14.tar.gz |
[LSC] Add LOCAL_LICENSE_KINDS to external/grpc-grpc-java am: 2690e046f4 am: 3629b61cb4 am: a198509f05
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1588995
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7ee4aaf43e5d92b105962d3318a4d48c06490173
-rw-r--r-- | Android.bp | 25 | ||||
-rw-r--r-- | annotation-stubs/Android.bp | 9 | ||||
-rw-r--r-- | auth/Android.bp | 9 | ||||
-rw-r--r-- | compiler/Android.bp | 9 | ||||
-rw-r--r-- | context/Android.bp | 9 | ||||
-rw-r--r-- | core/Android.bp | 9 | ||||
-rw-r--r-- | netty/shaded/Android.bp | 9 | ||||
-rw-r--r-- | okhttp/Android.bp | 9 | ||||
-rw-r--r-- | protobuf-lite/Android.bp | 9 | ||||
-rw-r--r-- | protobuf/Android.bp | 9 | ||||
-rw-r--r-- | stub/Android.bp | 9 | ||||
-rw-r--r-- | testing/Android.bp | 9 |
12 files changed, 123 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index 0fa5a64d5..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: [ @@ -41,4 +64,4 @@ java_library { "grpc-java-okhttp", ], sdk_version: "current", -}
\ No newline at end of file +} diff --git a/annotation-stubs/Android.bp b/annotation-stubs/Android.bp index 78cb49daa..2f1c39c1b 100644 --- a/annotation-stubs/Android.bp +++ b/annotation-stubs/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 { name: "grpc-java-annotation-stubs", host_supported: true, 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 410ce78c4..814b17a74 100644 --- a/context/Android.bp +++ b/context/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"], +} + java_library { name: "grpc-java-context", host_supported: true, diff --git a/core/Android.bp b/core/Android.bp index 9bfddc42f..d563293c8 100644 --- a/core/Android.bp +++ b/core/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 { name: "grpc-java-core", host_supported: true, 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 4e329f276..7212a3f57 100644 --- a/okhttp/Android.bp +++ b/okhttp/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 { name: "grpc-java-okhttp", host_supported: true, diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp index f1c46518b..2a2ed945c 100644 --- a/protobuf-lite/Android.bp +++ b/protobuf-lite/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"], +} + java_library { name: "grpc-java-protobuf-lite", host_supported: true, 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 af5270121..466195dcf 100644 --- a/stub/Android.bp +++ b/stub/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"], +} + java_library { name: "grpc-java-stub", host_supported: true, diff --git a/testing/Android.bp b/testing/Android.bp index 91dc79276..2d2a1c6d4 100644 --- a/testing/Android.bp +++ b/testing/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"], +} + java_library { name: "grpc-java-testing", host_supported: true, |