diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-21 19:04:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-21 19:04:32 +0000 |
| commit | feba0c589294aca536f089e4c9c86a6f121022a7 (patch) | |
| tree | cef87e8ae39ba698a34d80b7e8be04490d996505 | |
| parent | 1d4602b8257b5ae578d25fdc30728d3e6febeb5e (diff) | |
| parent | 966cc388cc2e2036c250ded6597e06d701b56531 (diff) | |
| download | hamcrest-feba0c589294aca536f089e4c9c86a6f121022a7.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/hamcrest" am: 3c480017c1 am: 8fb3ab4e2e am: 966cc388cc
Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1587903
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9bc292f1ebb5837b16f162ad2235d65db397cfe4
| -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 da980d8..1183db1 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, |