some launcher script tweaks

[android_pandora.git] / AndroidBoard.mk

diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index cf98d50..48b6e5d 100644 (file)
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -1,15 +1,5 @@
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_PREBUILT_KERNEL),)
-TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/kernel
-endif
-
-file := $(INSTALLED_KERNEL_TARGET)
-ALL_PREBUILT += $(file)
-$(file): $(TARGET_PREBUILT_KERNEL) | $(ACP)
-       $(transform-prebuilt-to-target)
-
-ifeq ($(TARGET_PROVIDES_INIT_RC),true)
 file := $(TARGET_ROOT_OUT)/init.rc
 ifeq ($(strip $(DSP_PATH)),)
 $(file): $(LOCAL_PATH)/init.rc | $(ACP)
@@ -18,7 +8,6 @@ $(file): $(LOCAL_PATH)/init.omap3.rc | $(ACP)
 endif
        $(transform-prebuilt-to-target)
 ALL_PREBUILT += $(file)
-endif
 
 ifneq ($(strip $(DSP_PATH)),)
 # DSP module node permissions
@@ -27,8 +16,9 @@ PRODUCT_COPY_FILES += \
 endif
 
 # keyboard
-#PRODUCT_COPY_FILES += \
-       $(LOCAL_PATH)/TWL4030_Keypad.kl:system/usr/keylayout/TWL4030_Keypad.kl
+PRODUCT_COPY_FILES += \
+       $(LOCAL_PATH)/keypad.kl:system/usr/keylayout/keypad.kl \
+       $(LOCAL_PATH)/gpio-keys.kl:system/usr/keylayout/gpio-keys.kl
 
 # Wifi
 PRODUCT_COPY_FILES += \
@@ -46,4 +36,9 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
        $(LOCAL_PATH)/initlogo.rle:root/initlogo.rle.bak
 
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := keypad.kcm
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_KEY_CHAR_MAP)
+
 include frameworks/base/data/sounds/OriginalAudio.mk