diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-03-18 14:53:16 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-18 14:53:16 +0000 |
commit | 59fb37d6a164181b368def8459af417b8a5d319d (patch) | |
tree | 899183b8d4e59769a299cb0475d17f8e125e8954 | |
parent | 708a148bf0e7d5a0008a0c90b2ad74e72b19f868 (diff) | |
parent | b52b685eadeca32f5340df9930d7140b59ba7675 (diff) | |
download | libyuv-59fb37d6a164181b368def8459af417b8a5d319d.tar.gz |
Merge "Snap for 7216193 from 9e24a0d95edc48ef21e36f43b772e0caa7975154 to emu-30-release" into emu-30-release
-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, |