From 443835c0b81189baa7cd6b7f1dc7739d6cf21feb Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 15:38:57 -0800 Subject: [LSC] Add LOCAL_LICENSE_KINDS to external/hamcrest Added SPDX-license-identifier-BSD to: Android.bp hamcrest-core/Android.bp hamcrest-library/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Id9817834e456f065748b1b021cefc612567d2ca3 --- Android.bp | 23 +++++++++++++++++++++++ hamcrest-core/Android.bp | 9 +++++++++ hamcrest-library/Android.bp | 9 +++++++++ 3 files changed, 41 insertions(+) diff --git a/Android.bp b/Android.bp index ec07728..65b997a 100644 --- a/Android.bp +++ b/Android.bp @@ -14,6 +14,29 @@ // // +package { + default_applicable_licenses: ["external_hamcrest_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_hamcrest_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD", + ], + license_text: [ + "LICENSE.txt", + "NOTICE", + ], +} + subdirs = [ "hamcrest-core", "hamcrest-library", diff --git a/hamcrest-core/Android.bp b/hamcrest-core/Android.bp index 6cb02ce..875819a 100644 --- a/hamcrest-core/Android.bp +++ b/hamcrest-core/Android.bp @@ -14,6 +14,15 @@ // // +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_hamcrest_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_hamcrest_license"], +} + java_library_static { name: "hamcrest", host_supported: true, diff --git a/hamcrest-library/Android.bp b/hamcrest-library/Android.bp index b91fb99..915ce48 100644 --- a/hamcrest-library/Android.bp +++ b/hamcrest-library/Android.bp @@ -14,6 +14,15 @@ // // +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_hamcrest_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_hamcrest_license"], +} + java_library_static { name: "hamcrest-library", host_supported: true, -- cgit v1.2.3