diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 01:25:47 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 01:25:47 +0000 |
commit | 5add04d4db71d8f5355320b16ed36dd37970d221 (patch) | |
tree | 474847570e86fd2fc7855c79bd91ad424f0d34dd | |
parent | d11d14cd1120bd35793d55026121816089c3ba5b (diff) | |
parent | 0e25b202fa383f46a3fd738b1504752151bedf57 (diff) | |
download | grpc-grpc-android12-mainline-conscrypt-release.tar.gz |
Snap for 7550844 from 0e25b202fa383f46a3fd738b1504752151bedf57 to mainline-conscrypt-releaseandroid-mainline-12.0.0_r8android-mainline-12.0.0_r25android12-mainline-conscrypt-release
Change-Id: I1092ec7d8225e26bfab3f7dcffd28121e1b178eb
-rw-r--r-- | Android.bp | 41 | ||||
-rw-r--r-- | METADATA | 6 | ||||
-rw-r--r-- | TEST_MAPPING | 8 | ||||
-rw-r--r-- | test/core/util/Android.bp | 9 | ||||
-rw-r--r-- | test/cpp/common/Android.bp | 9 | ||||
-rw-r--r-- | third_party/address_sorting/Android.bp | 19 |
6 files changed, 84 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp index 7034daf458..3edd4b6a92 100644 --- a/Android.bp +++ b/Android.bp @@ -1,3 +1,44 @@ +package { + default_applicable_licenses: ["external_grpc-grpc_license"], +} + +// Added automatically by a large-scale-change that took the approach of +// 'apply every license found to every target'. While this makes sure we respect +// every license restriction, it may not be entirely correct. +// +// e.g. GPL in an MIT project might only apply to the contrib/ directory. +// +// Please consider splitting the single license below into multiple licenses, +// taking care not to lose any license_kind information, and overriding the +// default license using the 'licenses: [...]' property on targets as needed. +// +// For unused files, consider creating a 'fileGroup' with "//visibility:private" +// to attach the license to, and including a comment whether the files may be +// used in the current project. +// +// 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_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-ISC", + "SPDX-license-identifier-MIT", + "SPDX-license-identifier-MPL-2.0", + "SPDX-license-identifier-Zlib", + "legacy_unencumbered", + ], + license_text: [ + "LICENSE", + "NOTICE.txt", + ], +} + cc_defaults { name: "grpc_defaults", cflags: [ diff --git a/METADATA b/METADATA new file mode 100644 index 0000000000..240084ecf3 --- /dev/null +++ b/METADATA @@ -0,0 +1,6 @@ +third_party { + # would be NOTICE save for MPL 2.0 in: + # etc/roots.pem + # src/android/test/interop/app/src/main/assets/roots.pem + license_type: RECIPROCAL +} diff --git a/TEST_MAPPING b/TEST_MAPPING deleted file mode 100644 index 9b5629f2ef..0000000000 --- a/TEST_MAPPING +++ /dev/null @@ -1,8 +0,0 @@ -{ - "postsubmit" : [ - { - "name" : "alarm_test", - "host" : true - } - ] -} diff --git a/test/core/util/Android.bp b/test/core/util/Android.bp index ed87486e02..fff362d588 100644 --- a/test/core/util/Android.bp +++ b/test/core/util/Android.bp @@ -1,3 +1,12 @@ +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_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_grpc-grpc_license"], +} + cc_library_static { name: "libgpr_test_util", defaults: ["grpc_defaults"], diff --git a/test/cpp/common/Android.bp b/test/cpp/common/Android.bp index 6e118cad49..2f6eb43178 100644 --- a/test/cpp/common/Android.bp +++ b/test/cpp/common/Android.bp @@ -1,3 +1,12 @@ +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_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_grpc-grpc_license"], +} + cc_test { name: "alarm_test", defaults: ["grpc_defaults"], diff --git a/third_party/address_sorting/Android.bp b/third_party/address_sorting/Android.bp index 767644e821..1756a37dcb 100644 --- a/third_party/address_sorting/Android.bp +++ b/third_party/address_sorting/Android.bp @@ -1,3 +1,22 @@ +package { + default_applicable_licenses: [ + "external_grpc-grpc_third_party_address_sorting_license", + ], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "external_grpc-grpc_third_party_address_sorting_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD", + ], + license_text: [ + "LICENSE", + ], +} + cc_library_static { name: "libaddress_sorting", defaults: ["grpc_defaults"], |