diff options
| author | 2025-03-20 20:28:09 -0700 | |
|---|---|---|
| committer | 2025-03-20 20:28:09 -0700 | |
| commit | 5ad0e8b1a26f4f3559d0136b91b59e812ffaad13 (patch) | |
| tree | 10961c2aad93ed3bf249eea3130e670b30fc8b23 | |
| parent | ae4ff23c17ad0ad75f4bc8f7653e3be22987e564 (diff) | |
| parent | eee659508c46a88b4332100aa4c132125ce1f4a5 (diff) | |
Merge "Revert "Convert PRODUCT_COPY_FILES for keyboards data to Android.bp"" into main am: eee659508c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3554852
Change-Id: Ic93da31c5479074dcf3e83361c6b49635212e3ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | data/keyboards/Android.bp | 11 | ||||
| -rw-r--r-- | data/keyboards/keyboards.mk | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/data/keyboards/Android.bp b/data/keyboards/Android.bp index 69b29bd5c7d3..423b55bd85db 100644 --- a/data/keyboards/Android.bp +++ b/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,6 +33,7 @@ prebuilt_usr_keylayout { srcs: [ "*.kl", ], + no_full_install: true, } prebuilt_usr_keychars { @@ -44,6 +41,7 @@ prebuilt_usr_keychars { srcs: [ "*.kcm", ], + no_full_install: true, } prebuilt_usr_idc { @@ -51,4 +49,5 @@ prebuilt_usr_idc { srcs: [ "*.idc", ], + no_full_install: true, } diff --git a/data/keyboards/keyboards.mk b/data/keyboards/keyboards.mk index 47bc63268754..c7ce8cd6693a 100644 --- a/data/keyboards/keyboards.mk +++ b/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) + + |