aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-16 23:17:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-16 23:17:46 +0000
commit731986f0c7e61d6de01c76cd6cd6fdde46259fb5 (patch)
tree899183b8d4e59769a299cb0475d17f8e125e8954
parenteb8de6a44c5b8766e7c18f1f7bdc4852ad139afa (diff)
parent2e0da364bdc08832256a9d1045e0105610f6a915 (diff)
downloadlibyuv-731986f0c7e61d6de01c76cd6cd6fdde46259fb5.tar.gz
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libyuv" am: 453f03cc16 am: bbfca9bc9f am: f6a075282d am: 2e0da364bd
Original change: https://android-review.googlesource.com/c/platform/external/libyuv/+/1588877 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I11655fc7f453281cdf7a1d6691a88332b5863710
-rw-r--r--Android.bp17
-rw-r--r--files/Android.bp24
-rw-r--r--files/fuzz/Android.bp9
3 files changed, 50 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 515d5626..e4ed511c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1 +1,18 @@
+package {
+ default_applicable_licenses: ["external_libyuv_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+ name: "external_libyuv_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-BSD",
+ ],
+ license_text: [
+ "LICENSE",
+ ],
+}
+
subdirs = ["files"]
diff --git a/files/Android.bp b/files/Android.bp
index 9dd6163d..c1aa8c67 100644
--- a/files/Android.bp
+++ b/files/Android.bp
@@ -1,3 +1,27 @@
+package {
+ default_applicable_licenses: ["external_libyuv_files_license"],
+}
+
+// Added automatically by a large-scale-change
+//
+// 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:'.
+// See: http://go/android-license-faq
+license {
+ name: "external_libyuv_files_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-BSD",
+ ],
+ license_text: [
+ "LICENSE",
+ "LICENSE_THIRD_PARTY",
+ "PATENTS",
+ ],
+}
+
cc_library {
name: "libyuv",
vendor_available: true,
diff --git a/files/fuzz/Android.bp b/files/fuzz/Android.bp
index be3c78e6..0e495899 100644
--- a/files/fuzz/Android.bp
+++ b/files/fuzz/Android.bp
@@ -1,4 +1,13 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "external_libyuv_files_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-BSD
+ default_applicable_licenses: ["external_libyuv_files_license"],
+}
+
cc_fuzz {
name: "libyuv_mjpeg_dec_fuzz",
host_supported: false,