diff options
author | Bob Badour <bbadour@google.com> | 2021-02-16 22:23:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 22:23:16 +0000 |
commit | f6a075282d095c26fb8f831493b536f5ca17bdc7 (patch) | |
tree | 899183b8d4e59769a299cb0475d17f8e125e8954 | |
parent | 4028e7a5b5ded1abcc8f52982eda6157963785ea (diff) | |
parent | bbfca9bc9f0aaee310d836160a20ba4ea8350094 (diff) | |
download | libyuv-f6a075282d095c26fb8f831493b536f5ca17bdc7.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libyuv" am: 453f03cc16 am: bbfca9bc9f
Original change: https://android-review.googlesource.com/c/platform/external/libyuv/+/1588877
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idd5ad443f7d218878ca74cec8c569c8c9928399b
-rw-r--r-- | Android.bp | 17 | ||||
-rw-r--r-- | files/Android.bp | 24 | ||||
-rw-r--r-- | files/fuzz/Android.bp | 9 |
3 files changed, 50 insertions, 0 deletions
@@ -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, |