Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tremolo" am: 0923e9ad20
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/1588802
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba277081e92f14dedd162712cb7da65f42c72292
diff --git a/Android.bp b/Android.bp
index bdf7f8d..58f339e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,33 @@
+package {
+ default_applicable_licenses: ["external_tremolo_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_tremolo_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-BSD",
+ ],
+ license_text: [
+ "NOTICE",
+ ],
+}
+
cc_library {
name: "libvorbisidec",
vendor_available: true,
diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp
index 38d830d..f5e9968 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_tremolo_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["external_tremolo_license"],
+}
+
cc_fuzz {
name: "vorbis_dec_fuzzer",
host_supported: true,
diff --git a/tests/Android.bp b/tests/Android.bp
index 9eb9a65..7cde87b 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -1,3 +1,12 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "external_tremolo_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["external_tremolo_license"],
+}
+
cc_test {
name: "VorbisDecoderTest",
gtest: true,
diff --git a/tests/oob_oggpack_look/Android.bp b/tests/oob_oggpack_look/Android.bp
index a27c234..5f7937f 100644
--- a/tests/oob_oggpack_look/Android.bp
+++ b/tests/oob_oggpack_look/Android.bp
@@ -1,3 +1,12 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "external_tremolo_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-BSD
+ default_applicable_licenses: ["external_tremolo_license"],
+}
+
cc_test {
name: "oob_oggpack_look",
gtest: true,