diff options
| author | Michael Wright <michaelwr@google.com> | 2013-09-04 22:37:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-04 22:37:05 +0000 |
| commit | 9f8c2d229febff3a331afd26137ba5abb173a84d (patch) | |
| tree | c1731b71326db791bd7a5378a1372e37fe63d8ac | |
| parent | 04c58e9ec12c65c15738ba456f18a1f36416b0cc (diff) | |
| parent | 18e14c75e3bce96690ac76c78fdb402af9740a01 (diff) | |
| download | frameworks_base-9f8c2d229febff3a331afd26137ba5abb173a84d.zip frameworks_base-9f8c2d229febff3a331afd26137ba5abb173a84d.tar.gz frameworks_base-9f8c2d229febff3a331afd26137ba5abb173a84d.tar.bz2 | |
Merge "Fix keymap build dependencies and variable name collisions" into klp-dev
| -rw-r--r-- | data/keyboards/Android.mk | 28 | ||||
| -rw-r--r-- | data/keyboards/common.mk | 6 | ||||
| -rw-r--r-- | data/keyboards/keyboards.mk | 12 | ||||
| -rw-r--r-- | packages/InputDevices/Android.mk | 24 |
4 files changed, 40 insertions, 30 deletions
diff --git a/data/keyboards/Android.mk b/data/keyboards/Android.mk index a66a884..898efe8 100644 --- a/data/keyboards/Android.mk +++ b/data/keyboards/Android.mk @@ -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 := diff --git a/data/keyboards/common.mk b/data/keyboards/common.mk index 87c2ef5..d75b691 100644 --- a/data/keyboards/common.mk +++ b/data/keyboards/common.mk @@ -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) diff --git a/data/keyboards/keyboards.mk b/data/keyboards/keyboards.mk index c964961..d545241 100644 --- a/data/keyboards/keyboards.mk +++ b/data/keyboards/keyboards.mk @@ -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)) diff --git a/packages/InputDevices/Android.mk b/packages/InputDevices/Android.mk index 095655c..f537022 100644 --- a/packages/InputDevices/Android.mk +++ b/packages/InputDevices/Android.mk @@ -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 := |