diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-17 15:54:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-17 15:54:01 +0000 |
| commit | d3457dd00db199f7890ca9385a0ebb3c6cd1f174 (patch) | |
| tree | 99edcfb26e48a280880478000f6f3cef0edcb011 | |
| parent | 2e74869c0f7da7c0e1bad4e7383b22eb6f53dfaf (diff) | |
| parent | 39d57e0f7bfd75cbcaa99ffdad483c6afc4523d3 (diff) | |
| download | libxaac-d3457dd00db199f7890ca9385a0ebb3c6cd1f174.tar.gz | |
[LSC] Add LOCAL_LICENSE_KINDS to external/libxaac am: 39d57e0f7b
Original change: https://android-review.googlesource.com/c/platform/external/libxaac/+/1588651
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie12bd9da045c95ef3b0408b3e24ee138fbdf596c
| -rw-r--r-- | Android.bp | 23 | ||||
| -rw-r--r-- | fuzzer/Android.bp | 9 | ||||
| -rw-r--r-- | test/Android.bp | 9 |
3 files changed, 41 insertions, 0 deletions
@@ -1,3 +1,26 @@ +package { + default_applicable_licenses: ["external_libxaac_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_libxaac_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "LICENSE", + "NOTICE", + ], +} + cc_library_static { name: "libxaacdec", diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp index 3c86555..1ea58b0 100644 --- a/fuzzer/Android.bp +++ b/fuzzer/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_libxaac_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_libxaac_license"], +} + cc_fuzz { name: "xaac_dec_fuzzer", host_supported: true, diff --git a/test/Android.bp b/test/Android.bp index 3d37ab1..e3e9e58 100644 --- a/test/Android.bp +++ b/test/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_libxaac_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_libxaac_license"], +} + cc_test { name: "xaacdec", |