diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-02 17:17:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-02 17:17:34 -0700 |
| commit | 24f59258572437ca3298cbfadcc176f2a83959ee (patch) | |
| tree | 5fd3297972c18769fdb8bb7c81893709209f845a | |
| parent | 164c1fb5b46bb07ed871bfbf49e5ca34de395e85 (diff) | |
| parent | 95d023575d09c3f2816cd21787181f83f628c14d (diff) | |
| download | device_samsung_crespo-24f59258572437ca3298cbfadcc176f2a83959ee.zip device_samsung_crespo-24f59258572437ca3298cbfadcc176f2a83959ee.tar.gz device_samsung_crespo-24f59258572437ca3298cbfadcc176f2a83959ee.tar.bz2 | |
am 95d02357: Handle .rc and .kl files as copied files.
Merge commit '95d023575d09c3f2816cd21787181f83f628c14d' into gingerbread-plus-aosp
* commit '95d023575d09c3f2816cd21787181f83f628c14d':
Handle .rc and .kl files as copied files.
| -rwxr-xr-x | AndroidBoard.mk | 27 | ||||
| -rw-r--r-- | device.mk | 10 |
2 files changed, 10 insertions, 27 deletions
diff --git a/AndroidBoard.mk b/AndroidBoard.mk index f4e9b31..4ae216c 100755 --- a/AndroidBoard.mk +++ b/AndroidBoard.mk @@ -14,40 +14,13 @@ LOCAL_PATH := $(call my-dir) -file := $(TARGET_OUT_KEYLAYOUT)/s3c-keypad.kl -ALL_PREBUILT += $(file) -$(file) : $(LOCAL_PATH)/s3c-keypad.kl | $(ACP) - $(transform-prebuilt-to-target) - include $(CLEAR_VARS) LOCAL_SRC_FILES := s3c-keypad.kcm include $(BUILD_KEY_CHAR_MAP) -file := $(TARGET_OUT_KEYLAYOUT)/melfas-touchkey.kl -ALL_PREBUILT += $(file) -$(file) : $(LOCAL_PATH)/melfas-touchkey.kl | $(ACP) - $(transform-prebuilt-to-target) - include $(CLEAR_VARS) LOCAL_SRC_FILES := melfas-touchkey.kcm include $(BUILD_KEY_CHAR_MAP) -include $(CLEAR_VARS) -target_init_rc_file := $(TARGET_ROOT_OUT)/init.rc -$(target_init_rc_file) : $(LOCAL_PATH)/init.rc | $(ACP) - $(transform-prebuilt-to-target) -ALL_PREBUILT += $(target_init_rc_file) - -target_hw_init_rc_file := $(TARGET_ROOT_OUT)/init.smdkc110.rc -$(target_hw_init_rc_file) : $(LOCAL_PATH)/init.smdkc110.rc | $(ACP) - $(transform-prebuilt-to-target) -ALL_PREBUILT += $(target_hw_init_rc_file) - -$(INSTALLED_RAMDISK_TARGET): $(target_init_rc_file) $(target_hw_init_rc_file) - -# to build the bootloader you need the common boot stuff, -# the architecture specific stuff, and the board specific stuff -# include bootloader/legacy/Android.mk - # Use the non-open-source parts, if they're present -include vendor/samsung/crespo/AndroidBoardVendor.mk @@ -48,6 +48,16 @@ PRODUCT_COPY_FILES := \ device/samsung/crespo/vold.fstab:system/etc/vold.fstab \ device/samsung/crespo/egl.cfg:system/lib/egl/egl.cfg +# Init files +PRODUCT_COPY_FILES += \ + device/samsung/crespo/init.rc:root/init.rc \ + device/samsung/crespo/init.smdkc110.rc:root/init.smdkc110.rc + +# Prebuilt 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 + # These are the hardware-specific features PRODUCT_COPY_FILES += \ frameworks/base/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \ |