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

Commit bb74d1e3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Convert validate_framework_keymaps to Android.bp" into main am:... 

Merge "Convert validate_framework_keymaps to Android.bp" into main am: fa892b02 am: b694305a am: 73fe31cf

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



Change-Id: I2a8553028bddb84714bd2b4174c30d6f17b99563
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 411857d9 73fe31cf

data/keyboards/Android.bp

0 → 100644
+29 −0
Original line number Diff line number Diff line 
// Copyright 2010 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



genrule {

    name: "validate_framework_keymaps",

    srcs: [

        "*.kl",

        "*.kcm",

        "*.idc",

    ],

    tools: ["validatekeymaps"],

    out: ["stamp"],

    cmd: "$(location validatekeymaps) -q $(in) " +

        "&& touch $(out)",

    dist: {

        targets: ["droidcore"],

    },

}

data/keyboards/Android.mk

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
# Copyright (C) 2010 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



# This makefile performs build time validation of framework keymap files.



LOCAL_PATH := $(call my-dir)



include $(LOCAL_PATH)/common.mk



# Validate all key maps.

include $(CLEAR_VARS)



LOCAL_MODULE := validate_framework_keymaps

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE

intermediates := $(call intermediates-dir-for,ETC,$(LOCAL_MODULE),,COMMON)

LOCAL_BUILT_MODULE := $(intermediates)/stamp



validatekeymaps := $(HOST_OUT_EXECUTABLES)/validatekeymaps$(HOST_EXECUTABLE_SUFFIX)

$(LOCAL_BUILT_MODULE): PRIVATE_VALIDATEKEYMAPS := $(validatekeymaps)

$(LOCAL_BUILT_MODULE) : $(framework_keylayouts) $(framework_keycharmaps) $(framework_keyconfigs) | $(validatekeymaps)

	$(hide) $(PRIVATE_VALIDATEKEYMAPS) -q $^

	$(hide) mkdir -p $(dir $@) && touch $@



# Run validatekeymaps uncondionally for platform build.

droidcore : $(LOCAL_BUILT_MODULE)



# Reset temp vars.

validatekeymaps :=

framework_keylayouts :=

framework_keycharmaps :=

framework_keyconfigs :=

data/keyboards/common.mk

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
# Copyright (C) 2010 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



# This is the list of framework provided keylayouts and key character maps to include.

# Used by Android.mk and keyboards.mk.



framework_keylayouts := $(wildcard $(LOCAL_PATH)/*.kl)



framework_keycharmaps := $(wildcard $(LOCAL_PATH)/*.kcm)



framework_keyconfigs := $(wildcard $(LOCAL_PATH)/*.idc)