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

Commit a1d09177 authored by Michael Wright's avatar Michael Wright Committed by Android Git Automerger
Browse files

am 7e0eecc4: am 9f8c2d22: Merge "Fix keymap build dependencies and variable... 

am 7e0eecc4: am 9f8c2d22: Merge "Fix keymap build dependencies and variable name collisions" into klp-dev

* commit '7e0eecc4':
  Fix keymap build dependencies and variable name collisions
parents 7bb90e9a 7e0eecc4

data/keyboards/Android.mk

+16 −12
Original line number Diff line number Diff line
@@ -21,17 +21,21 @@ include $(LOCAL_PATH)/common.mk 
# Validate all key maps.

include $(CLEAR_VARS)



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

files := \

    $(foreach file,$(keylayouts),frameworks/base/data/keyboards/$(file)) \

    $(foreach file,$(keycharmaps),frameworks/base/data/keyboards/$(file)) \

    $(foreach file,$(keyconfigs),frameworks/base/data/keyboards/$(file))



LOCAL_MODULE := validate_framework_keymaps

LOCAL_MODULE_TAGS := optional

LOCAL_REQUIRED_MODULES := validatekeymaps

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

LOCAL_BUILT_MODULE := $(intermediates)/stamp



validate_framework_keymaps: $(files)

	$(hide) $(validatekeymaps) $(files)



include $(BUILD_PHONY_PACKAGE)
 
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) $^

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



# Run validatekeymaps uncondionally for platform build.

droidcore all_modules : $(LOCAL_BUILT_MODULE)



# Reset temp vars.

validatekeymaps :=

framework_keylayouts :=

framework_keycharmaps :=

framework_keyconfigs :=

data/keyboards/common.mk

+3 −3
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
# This is the list of framework provided keylayouts and key character maps to include.

# Used by Android.mk and keyboards.mk.



keylayouts := $(notdir $(wildcard $(LOCAL_PATH)/*.kl))

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



keycharmaps := $(notdir $(wildcard $(LOCAL_PATH)/*.kcm))

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



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

data/keyboards/keyboards.mk

+6 −6
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 


include $(LOCAL_PATH)/common.mk



PRODUCT_COPY_FILES := $(foreach file,$(keylayouts),\

    frameworks/base/data/keyboards/$(file):system/usr/keylayout/$(file))

PRODUCT_COPY_FILES := $(foreach file,$(framework_keylayouts),\

    $(file):system/usr/keylayout/$(file))



PRODUCT_COPY_FILES += $(foreach file,$(keycharmaps),\

    frameworks/base/data/keyboards/$(file):system/usr/keychars/$(file))

PRODUCT_COPY_FILES += $(foreach file,$(framework_keycharmaps),\

    $(file):system/usr/keychars/$(file))



PRODUCT_COPY_FILES += $(foreach file,$(keyconfigs),\

    frameworks/base/data/keyboards/$(file):system/usr/idc/$(file))
 
PRODUCT_COPY_FILES += $(foreach file,$(framework_keyconfigs),\

    $(file):system/usr/idc/$(file))

packages/InputDevices/Android.mk

+15 −9
Original line number Diff line number Diff line
@@ -30,14 +30,20 @@ include $(BUILD_PACKAGE) 
# Validate all key maps.

include $(CLEAR_VARS)



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

files := frameworks/base/packages/InputDevices/res/raw/*.kcm



LOCAL_MODULE := validate_input_devices_keymaps

LOCAL_MODULE_TAGS := optional

LOCAL_REQUIRED_MODULES := validatekeymaps

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

LOCAL_BUILT_MODULE := $(intermediates)/stamp



validate_input_devices_keymaps: $(files)

	$(hide) $(validatekeymaps) $(files)



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

input_devices_keymaps := $(wildcard $(LOCAL_PATH)/res/raw/*.kcm)

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

$(LOCAL_BUILT_MODULE) : $(input_devices_keymaps) | $(validatekeymaps)

	$(hide) $(PRIVATE_VALIDATEKEYMAPS) $^

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



# Run validatekeymaps unconditionally for platform build.

droidcore all_modules : $(LOCAL_BUILT_MODULE)



# Reset temp vars.

validatekeymaps :=

input_devices_keymaps :=