summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2022-03-02 01:19:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-02 01:19:40 +0000
commitdc30f619bc5bde20c6081c0e48c4ce827e4aebf7 (patch)
tree4482f0fee70176fde08fe7b3bed75c73afb14132
parent2ad96f7309aacd583d025144567a27e133444f80 (diff)
parentf07b10e962ee47b2f9c437967a0e88e1f6a0df55 (diff)
downloadhyphenation-patterns-dc30f619bc5bde20c6081c0e48c4ce827e4aebf7.tar.gz
Add LOCAL_LICENSE_KINDS to external/hyphenation-patterns am: 50c96a4102 am: f07b10e962
Original change: https://android-review.googlesource.com/c/platform/external/hyphenation-patterns/+/2000651 Change-Id: Idcb208850e7138696e8190a0e4b4437bf654ccf0
-rw-r--r--Android.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 88ac611..6ee9ae0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -73,9 +73,9 @@ define build-one-pattern-module
$(eval include $(CLEAR_VARS))\
$(eval LOCAL_MODULE := $(addprefix hyph-, $(2)))\
$(eval LOCAL_SRC_FILES := $(addprefix $(1)/hyph-, $(addprefix $(2), .pat.txt .chr.txt .hyp.txt)))\
-$(eval LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT SPDX-license-identifier-BSD SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-MPL)\
-$(eval LOCAL_LICENSE_CONDITIONS := notice)\
-$(eval LOCAL_NOTICE_FILE := $(wildcard $(addprefix $(LOCAL_PATH)/$(1), /NOTICE)))\
+$(eval LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT SPDX-license-identifier-BSD-3-Clause SPDX-license-identifier-FSFAP SPDX-license-identifier-Unicode-DFS SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-MPL)\
+$(eval LOCAL_LICENSE_CONDITIONS := notice reciprocal restricted)\
+$(eval LOCAL_NOTICE_FILE := $(wildcard $(addprefix $(LOCAL_PATH)/$(1), /NOTICE /LICENSE)))\
$(eval include $(BUILD_HYB))\
$(eval include $(CLEAR_VARS))\
$(eval LOCAL_MODULE := $(addprefix $(addprefix hyph-, $(2)), .lic.txt))\
@@ -86,7 +86,7 @@ $(eval LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/hyphen-data)\
$(eval include $(BUILD_PREBUILT))
endef
-$(foreach l, $(pattern_locales), $(call build-one-pattern-module, $(dir $(l)), $(notdir $l)))
+$(foreach l, $(pattern_locales), $(call build-one-pattern-module,$(dir $(l)),$(notdir $l)))
build-one-pattern-module :=
pattern_locales :=