diff options
author | Bob Badour <bbadour@google.com> | 2021-02-10 19:39:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-10 19:39:04 +0000 |
commit | 060963d7f9efd6758ded5d62a930da7555949852 (patch) | |
tree | a884645475ec7a74f3a80abbb6051209fd5d437e | |
parent | b9d1c0936f7e48702c9e30e9eb14564e997db4c2 (diff) | |
parent | f272d83ac6f09b1131f34f4f1a8811f0117f40ba (diff) | |
download | libopus-060963d7f9efd6758ded5d62a930da7555949852.tar.gz |
Merge "Add LOCAL_LICENSE_KINDS to external/libopus" am: 4c764fbae9 am: 88ba89ccca am: f272d83ac6
Original change: https://android-review.googlesource.com/c/platform/external/libopus/+/1575674
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie5518719dcfe7e1a1c4b817cf0eca5fb7388ba3e
-rw-r--r-- | Android.bp | 36 | ||||
-rw-r--r-- | fuzzer/Android.bp | 8 |
2 files changed, 44 insertions, 0 deletions
@@ -1,3 +1,39 @@ +package { + default_applicable_licenses: ["external_libopus_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:'. +// http://go/android-license-faq +license { + name: "external_libopus_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + ], + license_text: [ + "COPYING", + "NOTICE", + ], +} + cc_library { name: "libopus", vendor_available: true, diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp index ec26e0a8..45ce6ab4 100644 --- a/fuzzer/Android.bp +++ b/fuzzer/Android.bp @@ -18,6 +18,14 @@ * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore */ +package { + // http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // the below license kinds from "external_libopus_license": + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_libopus_license"], +} + cc_defaults { name: "opus_fuzz_defaults", host_supported: true, |