summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-16 23:17:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-16 23:17:49 +0000
commit6f4ebc9b3511c9823102e85a55da9f817c413967 (patch)
tree2df0d39003b106b50723c9662b93579ec688e627
parentc8598a2c1d475849fb4ea4cce0d13aee672982ac (diff)
parentf1d4a023578763c2cc594d8f3238cd8473a25c6d (diff)
downloadapache-harmony-6f4ebc9b3511c9823102e85a55da9f817c413967.tar.gz
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-harmony" am: c07f62c472 am: 98cd96c3eb am: 77c0dc09d2 am: f1d4a02357
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1588867 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id356417fcfcca8940c44fc58b49f93039284fe9f
-rw-r--r--Android.bp14
-rw-r--r--jdwp/Android.bp24
2 files changed, 38 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index a5f80dc..e01b0af 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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,