summaryrefslogtreecommitdiffstats
path: root/target/product
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2012-02-16 18:26:45 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-16 18:26:45 -0800
commit6b960d2d5946cfb24a05b89c1189aac9af980df6 (patch)
treef21ecdcc1a0ea43d5070d916904541493aa81a55 /target/product
parent7295780576ff13c6b9be801f7277d82d29e81e4c (diff)
parenteaa3ba4b4391aa7e2f80f8bb74e9999ea1966771 (diff)
downloadbuild-6b960d2d5946cfb24a05b89c1189aac9af980df6.zip
build-6b960d2d5946cfb24a05b89c1189aac9af980df6.tar.gz
build-6b960d2d5946cfb24a05b89c1189aac9af980df6.tar.bz2
Merge "Make sure the emulator system image define the features it supports."
Diffstat (limited to 'target/product')
-rw-r--r--target/product/sdk.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 9e765b0..4cb4434 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -139,7 +139,10 @@ PRODUCT_COPY_FILES := \
system/core/rootdir/etc/vold.fstab:system/etc/vold.fstab \
frameworks/base/data/sounds/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
frameworks/base/data/sounds/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
- frameworks/base/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml
+ frameworks/base/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
+ frameworks/base/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \
+ frameworks/base/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml
+
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)