diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-05-03 02:14:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-03 02:14:33 +0000 |
| commit | fb29891cb243fa550c3d3bb39a929eff89b6929f (patch) | |
| tree | 016013bcc9aea44ab69a2612beac3034ab6c05ec | |
| parent | 8b70a2c62d33babd03848326e86a1cc719fa00ea (diff) | |
| parent | fd803f551e12d099384cb454e3ec20f0bfe4fd85 (diff) | |
| download | base-fb29891cb243fa550c3d3bb39a929eff89b6929f.tar.gz | |
Merge "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, 25 insertions, 5 deletions
diff --git a/data/keyboards/Android.bp b/data/keyboards/Android.bp index f15c1535a667..676493d16037 100644 --- a/data/keyboards/Android.bp +++ b/data/keyboards/Android.bp @@ -27,3 +27,24 @@ 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 c7ce8cd6693a..3353c86de38a 100644 --- a/data/keyboards/keyboards.mk +++ b/data/keyboards/keyboards.mk @@ -14,9 +14,8 @@ # Warning: this is actually a product definition, to be inherited from -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_PACKAGES += \ + keylayout_data \ + keychars_data \ + idc_data |