From 39d57e0f7bfd75cbcaa99ffdad483c6afc4523d3 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 18:26:03 -0800 Subject: [PATCH] [LSC] Add LOCAL_LICENSE_KINDS to external/libxaac Added SPDX-license-identifier-Apache-2.0 to: Android.bp fuzzer/Android.bp test/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I8f70bf816b41ad6d7bb4e473eaab96cc53dc4dde --- Android.bp | 23 +++++++++++++++++++++++ fuzzer/Android.bp | 9 +++++++++ test/Android.bp | 9 +++++++++ 3 files changed, 41 insertions(+) diff --git a/Android.bp b/Android.bp index abe03f7..f10e600 100644 --- a/Android.bp +++ b/Android.bp @@ -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",