Revert "Convert keyboards artifacts to soong"
This reverts commit fd803f551e12d099384cb454e3ec20f0bfe4fd85.
Reason for revert: This change break most of the tv targets. Please test building cf_x86_tv_gtv
Bug: 338497361
Change-Id: I5e9063f3099315de4ec6bde966bf8563f5faac56
diff --git a/data/keyboards/Android.bp b/data/keyboards/Android.bp
index 676493d..f15c153 100644
--- a/data/keyboards/Android.bp
+++ b/data/keyboards/Android.bp
@@ -27,24 +27,3 @@
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 3353c86..c7ce8cd 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)
+
