Merge "Use prebuilt keymaps in frameworks/base/data/keyboards."

This commit is contained in:
Jeff Brown 2010-11-18 14:20:53 -08:00 committed by Android (Google) Code Review
commit fbc4018d63
3 changed files with 2 additions and 2 deletions

View File

@ -27,7 +27,6 @@ GRANDFATHERED_ALL_PREBUILT := \
ap_gain.bin \
audio.conf \
auto_pairing.conf \
AVRCP.kl \
baseline11k.par \
baseline8k.par \
baseline.par \
@ -43,7 +42,6 @@ GRANDFATHERED_ALL_PREBUILT := \
cdt.bin \
chat-ril \
cmu6plus.ok.zip \
cpcap-key.kl \
data \
dbus.conf \
dev \

View File

@ -57,6 +57,7 @@ PRODUCT_COPY_FILES := \
system/bluetooth/data/network.conf:system/etc/bluetooth/network.conf
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)
# Overrides

View File

@ -121,6 +121,7 @@ PRODUCT_COPY_FILES := \
frameworks/base/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)
# Overrides