Fix problem with audio policy configuration file.

Having the copy of default audio_policy.conf file in generic_no_telephony.mk
doesn't work because of multiple inheritance on certain products.

Move it to board/generic/device.mk to be consistent with how the audio HAL
modules are managed.

Issue 6333980.

Change-Id: If6053ad596b6f693f43c72ba9cc54cb7a7cfa233
This commit is contained in:
Eric Laurent 2012-04-13 18:58:20 -07:00
parent db8698be85
commit 55f3f8549f
2 changed files with 2 additions and 2 deletions

View file

@ -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 \

View file

@ -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)