Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '9f8c2d229febff3a331afd26137ba5abb173a84d':
  Fix keymap build dependencies and variable name collisions
This commit is contained in:
Michael Wright
2013-09-04 15:39:52 -07:00
committed by Android Git Automerger
parent 44b4fd2cb9 9f8c2d229f
commit 7e0eecc436
4 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
data/keyboards/Android.mk
View File

@@ -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)
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 $@
include $(BUILD_PHONY_PACKAGE)
# Run validatekeymaps uncondionally for platform build.
droidcore all_modules : $(LOCAL_BUILT_MODULE)
# Reset temp vars.
validatekeymaps :=
framework_keylayouts :=
framework_keycharmaps :=
framework_keyconfigs :=

6
data/keyboards/common.mk
View File

@@ -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)

12
data/keyboards/keyboards.mk
View File

@@ -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))

22
packages/InputDevices/Android.mk
View File

@@ -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)
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 $@
include $(BUILD_PHONY_PACKAGE)
# Run validatekeymaps unconditionally for platform build.
droidcore all_modules : $(LOCAL_BUILT_MODULE)
# Reset temp vars.
validatekeymaps :=
input_devices_keymaps :=