diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-16 19:41:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 19:41:18 +0000 |
commit | efd34b6be888c05eb8cd9c69bd7f65acb09d491b (patch) | |
tree | cb306ffb64819f95c080c3cb6bfcdfb45a7b3a76 | |
parent | 0f8196545a616847740c4760f06cfa4bea19eef6 (diff) | |
parent | e5ec4259b0af6cdda294289d6c8a2438eea9764c (diff) | |
download | webrtc-efd34b6be888c05eb8cd9c69bd7f65acb09d491b.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/webrtc" am: 1eca29ee9a am: b2f0c6dc4a am: e5ec4259b0
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1588978
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I047fb5735e3692683e81320d7c4306609867df5f
-rw-r--r-- | Android.bp | 41 | ||||
-rw-r--r-- | third_party/abseil-cpp/Android.bp | 32 |
2 files changed, 73 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 1ee2bd7cb9..204ee672ef 100644 --- a/Android.bp +++ b/Android.bp @@ -1,3 +1,44 @@ +package { + default_applicable_licenses: ["external_webrtc_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_webrtc_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-MIT", + "SPDX-license-identifier-Zlib", + "legacy_notice", + "legacy_unencumbered", + ], + license_text: [ + "LICENSE", + "PATENTS", + "license_template.txt", + ], +} + cc_defaults { name: "webrtc_defaults", local_include_dirs: [ diff --git a/third_party/abseil-cpp/Android.bp b/third_party/abseil-cpp/Android.bp index bc7fff4196..6e8578dea8 100644 --- a/third_party/abseil-cpp/Android.bp +++ b/third_party/abseil-cpp/Android.bp @@ -1,3 +1,35 @@ +package { + default_applicable_licenses: [ + "external_webrtc_third_party_abseil-cpp_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. +// See: http://go/android-license-faq +license { + name: "external_webrtc_third_party_abseil-cpp_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "legacy_unencumbered", + ], + license_text: [ + "LICENSE", + ], +} + cc_defaults { name: "libwebrtc_absl_defaults", visibility: [ |