am c45cb0bf: Merge "Enable sound effect support in the SDK system image"

* commit 'c45cb0bf074b6fec4e9810cfa442cf1c89645dd7':
  Enable sound effect support in the SDK system image
This commit is contained in:
Jean-Baptiste Queru 2012-05-02 13:02:26 -07:00 committed by Android Git Automerger
commit 343597c3aa

View file

@ -79,7 +79,8 @@ PRODUCT_COPY_FILES := \
frameworks/base/data/sounds/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
frameworks/base/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
frameworks/base/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
frameworks/base/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml
frameworks/base/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \
frameworks/base/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)