diff options
author | Bob Badour <bbadour@google.com> | 2021-02-19 07:48:45 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-19 07:48:45 +0000 |
commit | 966cc388cc2e2036c250ded6597e06d701b56531 (patch) | |
tree | bc49e23da767d4c70471c0566413ceba1b11231b | |
parent | 00f96b3f5a5698b93a056e56a2a7f4200db5f0f3 (diff) | |
parent | 8fb3ab4e2e1eeca5511e68bdd0155c1704706ea4 (diff) | |
download | hamcrest-966cc388cc2e2036c250ded6597e06d701b56531.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/hamcrest" am: 3c480017c1 am: 8fb3ab4e2e
Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1587903
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I18ca0e0963ecd9f264ddda71fe57c3958feb8a1c
-rw-r--r-- | Android.bp | 23 | ||||
-rw-r--r-- | hamcrest-core/Android.bp | 9 | ||||
-rw-r--r-- | hamcrest-library/Android.bp | 9 |
3 files changed, 41 insertions, 0 deletions
@@ -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, |