summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-12-17 22:58:32 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-12-17 22:58:32 +0000
commitc0de8cfcfadf018828210a4d4d7ae939e0facd48 (patch)
tree3271d9cb23846ee83853175fa94b84e8c22eb1a3 /data
parent7c9eef5613cd6e9716dd608cbc08715c4f2ff19f (diff)
parent16624a11a8a8fa89ee4c8a33f2d8fedd00986e6d (diff)
Merge "Use find-copy-subdir-files macro to eliminate foreach calls"
Diffstat (limited to 'data')
-rw-r--r--data/keyboards/keyboards.mk12
1 files changed, 4 insertions, 8 deletions
diff --git a/data/keyboards/keyboards.mk b/data/keyboards/keyboards.mk
index 68cbd29859bb..c7ce8cd6693a 100644
--- a/data/keyboards/keyboards.mk
+++ b/data/keyboards/keyboards.mk
@@ -14,13 +14,9 @@
# Warning: this is actually a product definition, to be inherited from
-include $(LOCAL_PATH)/common.mk
+PRODUCT_COPY_FILES := \
+ $(call find-copy-subdir-files,*.kl,$(LOCAL_PATH),system/usr/keylayout) \
+ $(call find-copy-subdir-files,*.kcm,$(LOCAL_PATH),system/usr/keychars) \
+ $(call find-copy-subdir-files,*.idc,$(LOCAL_PATH),system/usr/idc)
-PRODUCT_COPY_FILES := $(foreach file,$(framework_keylayouts),\
- $(file):system/usr/keylayout/$(notdir $(file)))
-PRODUCT_COPY_FILES += $(foreach file,$(framework_keycharmaps),\
- $(file):system/usr/keychars/$(notdir $(file)))
-
-PRODUCT_COPY_FILES += $(foreach file,$(framework_keyconfigs),\
- $(file):system/usr/idc/$(notdir $(file)))