diff options
| author | Eric Laurent <elaurent@google.com> | 2012-04-14 08:49:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-14 08:49:33 -0700 |
| commit | baf3450462eafab961e016457eb83d43aff11647 (patch) | |
| tree | adbb318b64ae872ad4b798658c74a6e0cbc1c2af /target | |
| parent | dbff3f5b77fa898175d823736188deb6bf72f419 (diff) | |
| parent | 55f3f8549fe82316e3f5437d5b849bad42f8594e (diff) | |
| download | build-baf3450462eafab961e016457eb83d43aff11647.zip build-baf3450462eafab961e016457eb83d43aff11647.tar.gz build-baf3450462eafab961e016457eb83d43aff11647.tar.bz2 | |
Merge "Fix problem with audio policy configuration file."
Diffstat (limited to 'target')
| -rw-r--r-- | target/board/generic/device.mk | 1 | ||||
| -rw-r--r-- | target/product/generic_no_telephony.mk | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk index ca18365..f8e5162 100644 --- a/target/board/generic/device.mk +++ b/target/board/generic/device.mk @@ -27,6 +27,7 @@ PRODUCT_COPY_FILES := \ development/data/etc/vold.conf:system/etc/vold.conf \ development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml \ development/tools/emulator/system/camera/media_codecs.xml:system/etc/media_codecs.xml \ + hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf PRODUCT_PACKAGES := \ audio.primary.goldfish \ diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk index e1b5474..d8bda3e 100644 --- a/target/product/generic_no_telephony.mk +++ b/target/product/generic_no_telephony.mk @@ -71,8 +71,7 @@ PRODUCT_COPY_FILES := \ system/bluetooth/data/blacklist.conf:system/etc/bluetooth/blacklist.conf \ system/bluetooth/data/input.conf:system/etc/bluetooth/input.conf \ system/bluetooth/data/network.conf:system/etc/bluetooth/network.conf \ - frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \ - hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf + frameworks/av/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, external/lohit-fonts/fonts.mk) |