diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-17 23:18:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-17 23:18:45 +0000 |
| commit | 8b35683bd8cc2452168e6d523a56235b72a7f01a (patch) | |
| tree | bc890745dffee6059e069361a8642fb57d7077c2 | |
| parent | ec8bb25be600193c8e73323bbaeb5414a6c0fc28 (diff) | |
| parent | 94327cd0477b52ce379b4b2f1df7a69c18cca887 (diff) | |
Merge "Use find-copy-subdir-files macro to eliminate foreach calls" am: c0de8cfcfa am: 94327cd047
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520140
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib739cc77e53e805476b73e0f086366c9ef280cca
| -rw-r--r-- | data/keyboards/keyboards.mk | 12 |
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))) |