From 16624a11a8a8fa89ee4c8a33f2d8fedd00986e6d Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Mon, 7 Dec 2020 16:07:51 -0800 Subject: [PATCH] Use find-copy-subdir-files macro to eliminate foreach calls This change facilitates configuration makefile conversion to starlark. Test: treehugger Bug: 172923994 Change-Id: I2e965a8568f9cd94f171e32c2fa444400ec868cb --- data/keyboards/keyboards.mk | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/data/keyboards/keyboards.mk b/data/keyboards/keyboards.mk index 68cbd29859bbf..c7ce8cd6693ab 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)))