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

Commit 5ad0e8b1 authored by Sadiq Sada's avatar Sadiq Sada Committed by Automerger Merge Worker
Browse files

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

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

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



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

data/keyboards/Android.bp

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

}

data/keyboards/keyboards.mk

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