diff options
author | Bob Badour <bbadour@google.com> | 2021-02-17 18:48:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-17 18:48:56 +0000 |
commit | 2020366ce72acf87c8dea489fdc0873759e4e1f3 (patch) | |
tree | 110883aee1d9177a9761ff7991a217a039073414 | |
parent | 80ccc5df599a1c05ce88b17f347da14e4dc2c311 (diff) | |
parent | 7ad87e81d757cfba10eb273d9b063cf80e5e4133 (diff) | |
download | fdk-aac-2020366ce72acf87c8dea489fdc0873759e4e1f3.tar.gz fdk-aac-2020366ce72acf87c8dea489fdc0873759e4e1f3.tar.bz2 fdk-aac-2020366ce72acf87c8dea489fdc0873759e4e1f3.zip |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06f am: 7ad87e81d7
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1588770
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I12c397ed7120bed1014941d0b1413d2bf9c29bb5
-rw-r--r-- | Android.bp | 33 | ||||
-rw-r--r-- | fuzzer/Android.bp | 9 |
2 files changed, 42 insertions, 0 deletions
@@ -1,3 +1,36 @@ +// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE +// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE +// DEPENDING ON IT IN YOUR PROJECT. *** +package { + default_applicable_licenses: ["external_aac_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_aac_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "legacy_by_exception_only", // by exception only + ], + license_text: [ + "NOTICE", + ], +} + cc_library_static { name: "libFraunhoferAAC", vendor_available: true, diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp index 0aff547..6739798 100644 --- a/fuzzer/Android.bp +++ b/fuzzer/Android.bp @@ -18,6 +18,15 @@ * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore */ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_aac_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_aac_license"], +} + cc_defaults { name: "aac_fuzz_defaults", host_supported: true, |