summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2010-04-08 22:50:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-08 22:50:33 -0700
commitb15c119d265a92bca48264d9651b4b39eda22fcb (patch)
treefc934974c3d0fe69473c20419e66495067cdc4ac /target
parent693e65551364101ef4086cb3f2938036947ba4ec (diff)
parent19e9fff37e4d3309557d07cf963dc577ca49fcf0 (diff)
downloadbuild-b15c119d265a92bca48264d9651b4b39eda22fcb.zip
build-b15c119d265a92bca48264d9651b4b39eda22fcb.tar.gz
build-b15c119d265a92bca48264d9651b4b39eda22fcb.tar.bz2
am 19e9fff3: am 74134a50: Add camera sounds to the emulator system image build.
Merge commit '19e9fff37e4d3309557d07cf963dc577ca49fcf0' into kraken * commit '19e9fff37e4d3309557d07cf963dc577ca49fcf0': Add camera sounds to the emulator system image build.
Diffstat (limited to 'target')
-rw-r--r--target/product/sdk.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 5884f6c..c0e6c6d 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -54,6 +54,8 @@ PRODUCT_PACKAGE_OVERLAYS := development/sdk_overlay
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
$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)