aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-04 21:47:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-04 21:47:39 +0000
commitc4d09d27b7f0f0320a4d30fdb09f588955924712 (patch)
tree14d78b5ebd85a13b55255175a696719250453e1d
parent706431b8ac41330f71847c9aae7550a714bfc4b0 (diff)
parentd22f5a7bb2b16c6839cdb897ad83e3591fa11a4c (diff)
downloadlzma-c4d09d27b7f0f0320a4d30fdb09f588955924712.tar.gz
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/lzma" am: 435ea22543 am: 268b867a00 am: df89996f6d am: d22f5a7bb2
Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1575760 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic794a1834730921b372210b07e1aa166e7249094
-rw-r--r--Android.bp16
-rw-r--r--C/Android.bp7
2 files changed, 23 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 4a68eda..b1ffe6c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,19 @@
+package {
+ default_applicable_licenses: ["external_lzma_license"],
+}
+
+// Added automatically by a large-scale-change
+license {
+ name: "external_lzma_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "legacy_unencumbered",
+ ],
+ license_text: [
+ "NOTICE",
+ ],
+}
+
subdirs = [
"C",
]
diff --git a/C/Android.bp b/C/Android.bp
index 01978d6..4d6c5cf 100644
--- a/C/Android.bp
+++ b/C/Android.bp
@@ -1,5 +1,12 @@
// Copyright 2015 The Android Open Source Project
+package {
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "external_lzma_license":
+ // legacy_unencumbered
+ default_applicable_licenses: ["external_lzma_license"],
+}
+
cc_library {
name: "liblzma",
host_supported: true,