diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-16 22:23:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 22:23:27 +0000 |
| commit | 3880a778dd364048ed8911b7231d61debcc7117b (patch) | |
| tree | 81cf371bfb80dcb79abeb72c1f8199e3a203d033 | |
| parent | 76347a447b4634152ac2e67f551dd4f9ea0c1edd (diff) | |
| parent | 2c04ec60be3318cf88e869749f41a38747b8fc53 (diff) | |
| download | libaom-3880a778dd364048ed8911b7231d61debcc7117b.tar.gz | |
[LSC] Add LOCAL_LICENSE_KINDS to external/libaom am: 76e5910cfe am: 2c04ec60be
Original change: https://android-review.googlesource.com/c/platform/external/libaom/+/1588911
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifd80016872448cf96c85f1c170f2d3ad5bea1eab
| -rw-r--r-- | Android.bp | 31 | ||||
| -rw-r--r-- | libaom/third_party/libwebm/Android.mk | 3 |
2 files changed, 34 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 626266861..c31105f7b 100644 --- a/Android.bp +++ b/Android.bp @@ -1,6 +1,37 @@ // THIS FILE IS AUTOGENERATED, DO NOT EDIT // Generated from Android.bp.in, run ./generate_config.sh to regenerate +package { + default_applicable_licenses: ["external_libaom_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_libaom_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-ISC", + "SPDX-license-identifier-MIT", + "legacy_reciprocal", + "legacy_unencumbered", + ], + // large-scale-change unable to identify any license_text files +} + aom_av1_common_intrin_avx2 = [ "libaom/av1/common/cdef_block_avx2.c", "libaom/av1/common/x86/av1_inv_txfm_avx2.c", diff --git a/libaom/third_party/libwebm/Android.mk b/libaom/third_party/libwebm/Android.mk index b46ba101d..72e5583c1 100644 --- a/libaom/third_party/libwebm/Android.mk +++ b/libaom/third_party/libwebm/Android.mk @@ -2,6 +2,9 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE:= libwebm +LOCAL_LICENSE_KINDS:= SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS:= notice +LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/LICENSE.TXT $(LOCAL_PATH)/PATENTS.TXT LOCAL_CPPFLAGS:=-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS LOCAL_CPPFLAGS+=-D__STDC_LIMIT_MACROS -std=c++11 LOCAL_C_INCLUDES:= $(LOCAL_PATH) |