diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-16 22:23:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 22:23:19 +0000 |
| commit | 77c0dc09d2e01cbba34d2bab9831cc28e75bc99c (patch) | |
| tree | 2df0d39003b106b50723c9662b93579ec688e627 | |
| parent | da6c4c5b352bd2258bf31c25b5fe7ecaa9ad285f (diff) | |
| parent | 98cd96c3eb491ae021fa1d140dee19be1b08893d (diff) | |
| download | apache-harmony-77c0dc09d2e01cbba34d2bab9831cc28e75bc99c.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-harmony" am: c07f62c472 am: 98cd96c3eb
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1588867
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9660fc2ea4722afaff4fc4281cee51c858cd61b9
| -rw-r--r-- | Android.bp | 14 | ||||
| -rw-r--r-- | jdwp/Android.bp | 24 |
2 files changed, 38 insertions, 0 deletions
@@ -14,6 +14,20 @@ package { default_visibility: ["//visibility:private"], + default_applicable_licenses: ["external_apache-harmony_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "external_apache-harmony_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], } java_test { diff --git a/jdwp/Android.bp b/jdwp/Android.bp index 507bef8..83e3d28 100644 --- a/jdwp/Android.bp +++ b/jdwp/Android.bp @@ -1,3 +1,27 @@ +package { + default_applicable_licenses: ["external_apache-harmony_jdwp_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_apache-harmony_jdwp_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "COPYRIGHT.txt", + "LICENSE.txt", + "NOTICE.txt", + ], +} + java_genrule { name: "SourceDebugExtensionMockClass_gen", host_supported: true, |