Merge "Revert "Convert PRODUCT_COPY_FILES for keyboards data to Android.bp"" into main

Author: Sadiq Sada

data/keyboards/Android.bp

@@ -12,16 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
 genrule {
     name: "validate_framework_keymaps",
     srcs: [
-        "*.idc",
-        "*.kcm",
         "*.kl",
+        "*.kcm",
+        "*.idc",
     ],
     tools: ["validatekeymaps"],
     out: ["stamp"],
@@ -37,18 +33,21 @@ prebuilt_usr_keylayout {
     srcs: [
         "*.kl",
     ],
+    no_full_install: true,
 }
 
 prebuilt_usr_keychars {
     name: "keychars_data",
     srcs: [
         "*.kcm",
     ],
+    no_full_install: true,
 }
 
 prebuilt_usr_idc {
     name: "idc_data",
     srcs: [
         "*.idc",
     ],
+    no_full_install: true,
 }

data/keyboards/keyboards.mk

@@ -14,7 +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)
+
+