Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d2250c7 authored by Hongguang Chen's avatar Hongguang Chen Committed by Automerger Merge Worker
Browse files

Merge "Revert "Convert keyboards artifacts to soong"" into main am: ca3da5d1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3073844



Change-Id: I59f6c189bf1ec93c5225d01bbf39f1096daee14a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 39708907 ca3da5d1

data/keyboards/Android.bp

+0 −21
Original line number Diff line number Diff line
@@ -27,24 +27,3 @@ genrule { 
        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",

    ],

}

data/keyboards/keyboards.mk

+5 −4
Original line number Diff line number Diff line
@@ -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)