Convert keyboards artifacts to soong
Bug: 337993945
Test: m
Change-Id: I762f41500fb9b360245fbf58a6526dd594ff332e
diff --git a/data/keyboards/Android.bp b/data/keyboards/Android.bp
index f15c153..676493d 100644
--- a/data/keyboards/Android.bp
+++ b/data/keyboards/Android.bp
@@ -27,3 +27,24 @@
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 c7ce8cd..3353c86 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
