aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-17 18:07:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-17 18:07:22 +0000
commit7ad87e81d757cfba10eb273d9b063cf80e5e4133 (patch)
tree110883aee1d9177a9761ff7991a217a039073414
parentb3ae2fd27f28e7a931b860a217b230f438931338 (diff)
parent9f1be9d06f75a3b7dbe10c0b3296ce6c612be970 (diff)
downloadfdk-aac-7ad87e81d757cfba10eb273d9b063cf80e5e4133.tar.gz
fdk-aac-7ad87e81d757cfba10eb273d9b063cf80e5e4133.tar.bz2
fdk-aac-7ad87e81d757cfba10eb273d9b063cf80e5e4133.zip
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06f
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1588770 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I37a9304f439a0ed700126de649a37378d03ce6bc
-rw-r--r--Android.bp33
-rw-r--r--fuzzer/Android.bp9
2 files changed, 42 insertions, 0 deletions
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,