diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-11-18 14:20:53 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-18 14:20:53 -0800 |
| commit | fbc4018d63dca8bf97750677351ec943c7bc75f4 (patch) | |
| tree | 900e19b2dcae68d55403c716cd1c9a3c0a0b299f | |
| parent | 63e9ccd1d6685b5551d836775928383117bebb11 (diff) | |
| parent | 99aacc211ea62e6a143445d1809e19980f49b956 (diff) | |
| download | build-fbc4018d63dca8bf97750677351ec943c7bc75f4.zip build-fbc4018d63dca8bf97750677351ec943c7bc75f4.tar.gz build-fbc4018d63dca8bf97750677351ec943c7bc75f4.tar.bz2 | |
Merge "Use prebuilt keymaps in frameworks/base/data/keyboards."
| -rw-r--r-- | core/legacy_prebuilts.mk | 2 | ||||
| -rw-r--r-- | target/product/generic_no_telephony.mk | 1 | ||||
| -rw-r--r-- | target/product/sdk.mk | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/core/legacy_prebuilts.mk b/core/legacy_prebuilts.mk index b11f064..53328b3 100644 --- a/core/legacy_prebuilts.mk +++ b/core/legacy_prebuilts.mk @@ -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 \ diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk index 69e8d84..6635d2c 100644 --- a/target/product/generic_no_telephony.mk +++ b/target/product/generic_no_telephony.mk @@ -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 diff --git a/target/product/sdk.mk b/target/product/sdk.mk index 14f75fa..b856b11 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -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 |