diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-17 17:22:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-17 17:22:22 +0000 |
| commit | 491d316289f4c2c2554c1d9066574e224be00386 (patch) | |
| tree | 99edcfb26e48a280880478000f6f3cef0edcb011 | |
| parent | 46e718fa6e0a561555e45507c420bc8c9a1a5d6a (diff) | |
| parent | c6a688f83af5aa6e475717935f10308f7a421322 (diff) | |
| download | libxaac-491d316289f4c2c2554c1d9066574e224be00386.tar.gz | |
[LSC] Add LOCAL_LICENSE_KINDS to external/libxaac am: 39d57e0f7b am: d3457dd00d am: c6a688f83a
Original change: https://android-review.googlesource.com/c/platform/external/libxaac/+/1588651
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2a77b9c524e0b7b591e1365567f58d93a7a94afa
| -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", |