diff options
| author | 2025-03-20 13:05:07 -0700 | |
|---|---|---|
| committer | 2025-03-20 13:05:07 -0700 | |
| commit | b2af58f0c72ffb8dda9453a160b968026dc76a5c (patch) | |
| tree | 3db165aa89dfb6262c01ba39968c13eaa72b1f98 | |
| parent | eea3b0d26916f92184b48d8ba95a064db2ca884c (diff) | |
| parent | 2415c43a8bf5e683555fcaa48d1dad522db62229 (diff) | |
Merge "Convert PRODUCT_COPY_FILES for keyboards data to Android.bp" into main
| -rw-r--r-- | data/keyboards/Android.bp | 11 | ||||
| -rw-r--r-- | data/keyboards/keyboards.mk | 10 |
2 files changed, 10 insertions, 11 deletions
diff --git a/data/keyboards/Android.bp b/data/keyboards/Android.bp index 423b55bd85db..69b29bd5c7d3 100644 --- a/data/keyboards/Android.bp +++ b/data/keyboards/Android.bp @@ -12,12 +12,16 @@ // 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: [ - "*.kl", - "*.kcm", "*.idc", + "*.kcm", + "*.kl", ], tools: ["validatekeymaps"], out: ["stamp"], @@ -33,7 +37,6 @@ prebuilt_usr_keylayout { srcs: [ "*.kl", ], - no_full_install: true, } prebuilt_usr_keychars { @@ -41,7 +44,6 @@ prebuilt_usr_keychars { srcs: [ "*.kcm", ], - no_full_install: true, } prebuilt_usr_idc { @@ -49,5 +51,4 @@ prebuilt_usr_idc { srcs: [ "*.idc", ], - no_full_install: true, } diff --git a/data/keyboards/keyboards.mk b/data/keyboards/keyboards.mk index c7ce8cd6693a..47bc63268754 100644 --- a/data/keyboards/keyboards.mk +++ b/data/keyboards/keyboards.mk @@ -14,9 +14,7 @@ # 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 |