diff options
| author | Michael Wright <michaelwr@google.com> | 2013-08-29 14:33:58 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-09-03 12:27:18 -0700 |
| commit | 18e14c75e3bce96690ac76c78fdb402af9740a01 (patch) | |
| tree | 7a98143cb9dd9738a2c7c7aad153bddb76509fd3 /packages/InputDevices | |
| parent | 5c2dfa8a21e7bd4e07e00f268d30058b654aa099 (diff) | |
| download | frameworks_base-18e14c75e3bce96690ac76c78fdb402af9740a01.zip frameworks_base-18e14c75e3bce96690ac76c78fdb402af9740a01.tar.gz frameworks_base-18e14c75e3bce96690ac76c78fdb402af9740a01.tar.bz2 | |
Fix keymap build dependencies and variable name collisions
Change-Id: I06e67ddc97429ae9c3d04143934c3f8233fcd22f
Diffstat (limited to 'packages/InputDevices')
| -rw-r--r-- | packages/InputDevices/Android.mk | 24 |
1 files changed, 15 insertions, 9 deletions
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 := |