diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-03 02:02:35 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-03 02:02:35 +0000 |
| commit | 822da231787e6cfe73d97a940ff313316beb7742 (patch) | |
| tree | 6edad9dd3a01422def2e9b06a1cb17e754dd4aa5 | |
| parent | b32a9e0676c62bca3bede14546fb827aa4390b17 (diff) | |
| parent | f3b93a52850c6efe3acbba8e704cacfcfb5ff78b (diff) | |
| download | hyphenation-patterns-android13-security-release.tar.gz | |
Snap for 8241717 from f3b93a52850c6efe3acbba8e704cacfcfb5ff78b to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-t-beta-4-gplandroid-t-beta-3.2-gplandroid-t-beta-3android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r2android-platform-13.0.0_r1android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-gsi
Change-Id: Ide48e87a8565c210096490bf5c6bafa0db75e09e
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -88,9 +88,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))\ @@ -101,7 +101,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 := |