From 176eed73f14eab86ff20a5b4a0d00c688b51fcd0 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 15:27:18 -0800 Subject: [PATCH] [LSC] Add LOCAL_LICENSE_KINDS to external/aac Added SPDX-license-identifier-Apache-2.0 to: fuzzer/Android.bp Added SPDX-license-identifier-Apache-2.0 legacy_by_exception_only to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I518bcad1cb91b80b2bcce1726f53aadf9afc749e --- Android.bp | 33 +++++++++++++++++++++++++++++++++ fuzzer/Android.bp | 9 +++++++++ 2 files changed, 42 insertions(+) diff --git a/Android.bp b/Android.bp index c1e8734..0c67186 100644 --- a/Android.bp +++ b/Android.bp @@ -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,