diff options
| -rwxr-xr-x | Android.mk | 12 | ||||
| -rwxr-xr-x | AndroidBoard.mk | 8 | ||||
| -rw-r--r-- | device.mk | 7 |
3 files changed, 17 insertions, 10 deletions
@@ -1,3 +1,13 @@ ifeq ($(TARGET_DEVICE),crespo) -include $(call all-subdir-makefiles) +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := s3c-keypad.kcm +include $(BUILD_KEY_CHAR_MAP) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := melfas-touchkey.kcm +include $(BUILD_KEY_CHAR_MAP) + +include $(call all-makefiles-under,$(LOCAL_PATH)) endif diff --git a/AndroidBoard.mk b/AndroidBoard.mk index 4ae216c..fcc7ab2 100755 --- a/AndroidBoard.mk +++ b/AndroidBoard.mk @@ -14,13 +14,5 @@ LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) -LOCAL_SRC_FILES := s3c-keypad.kcm -include $(BUILD_KEY_CHAR_MAP) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := melfas-touchkey.kcm -include $(BUILD_KEY_CHAR_MAP) - # Use the non-open-source parts, if they're present -include vendor/samsung/crespo/AndroidBoardVendor.mk @@ -53,11 +53,16 @@ PRODUCT_COPY_FILES += \ device/samsung/crespo/init.rc:root/init.rc \ device/samsung/crespo/init.smdkc110.rc:root/init.smdkc110.rc -# Prebuilt keymaps +# Prebuilt kl keymaps PRODUCT_COPY_FILES += \ device/samsung/crespo/s3c-keypad.kl:system/usr/keylayout/s3c-keypad.kl \ device/samsung/crespo/melfas-touchkey.kl:system/usr/keylayout/melfas-touchkey.kl +# Generated kcm keymaps +PRODUCT_PACKAGES := \ + s3c-keypad.kcm \ + melfas-touchkey.kcm + # These are the hardware-specific features PRODUCT_COPY_FILES += \ frameworks/base/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \ |