diff options
| author | Hongguang Chen <hgchen@google.com> | 2024-05-03 04:45:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-03 04:45:56 +0000 |
| commit | ca3da5d19c2bf7529b289b3e1da3ed45a7db657e (patch) | |
| tree | 87a6dfab3221548598d0be8cc165e19d201f75b0 | |
| parent | fb29891cb243fa550c3d3bb39a929eff89b6929f (diff) | |
| parent | 015967158f71fee4951d950ae0b1dc5837ca357f (diff) | |
| download | base-ca3da5d19c2bf7529b289b3e1da3ed45a7db657e.tar.gz | |
Merge "Revert "Convert keyboards artifacts to soong"" into main
| -rw-r--r-- | data/keyboards/Android.bp | 21 | ||||
| -rw-r--r-- | data/keyboards/keyboards.mk | 9 |
2 files changed, 5 insertions, 25 deletions
diff --git a/data/keyboards/Android.bp b/data/keyboards/Android.bp index 676493d16037..f15c1535a667 100644 --- a/data/keyboards/Android.bp +++ b/data/keyboards/Android.bp @@ -27,24 +27,3 @@ genrule { targets: ["droidcore"], }, } - -prebuilt_usr_keylayout { - name: "keylayout_data", - srcs: [ - "*.kl", - ], -} - -prebuilt_usr_keychars { - name: "keychars_data", - srcs: [ - "*.kcm", - ], -} - -prebuilt_usr_idc { - name: "idc_data", - srcs: [ - "*.idc", - ], -} diff --git a/data/keyboards/keyboards.mk b/data/keyboards/keyboards.mk index 3353c86de38a..c7ce8cd6693a 100644 --- a/data/keyboards/keyboards.mk +++ b/data/keyboards/keyboards.mk @@ -14,8 +14,9 @@ # Warning: this is actually a product definition, to be inherited from -PRODUCT_PACKAGES += \ - keylayout_data \ - keychars_data \ - idc_data +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) + |