p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix audio policy configuration for generic targets 

Changes in this CL:
1. Use ":=", instead of "+=", for PRODUCT_COPY_FILES so previous audio
policy related settings won't be overwritten.
2. Use basic audio policy XML files provided by audio team as default.

Bug: 62524944
Test: check if the XML files for audio policy configuration are under
      /system/etc and devices with generic system imagei, but without
      such configuration under /vendor/etc can boot with audio working.

Change-Id: I4ccffdfb131a9d2445d9c2f52a22ffcc97884479
This commit is contained in:
Isaac Chen 2017-06-12 18:56:50 +08:00
parent d6e984f9e3
commit 924e705c85
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/product/treble_common.mk
View File

@ -170,14 +170,13 @@ USE_XML_AUDIO_POLICY_CONF := 1
# The following policy XML files are used as fallback for # The following policy XML files are used as fallback for
# vendors/devices not using XML to configure audio policy. # vendors/devices not using XML to configure audio policy.
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
frameworks/av/services/audiopolicy/config/audio_policy_configuration.xml:system/etc/audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:system/etc/audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:system/etc/a2dp_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:system/etc/primary_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:system/etc/usb_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:system/etc/r_submix_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:system/etc/r_submix_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:system/etc/audio_policy_volumes.xml \ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:system/etc/audio_policy_volumes.xml \
frameworks/av/services/audiopolicy/config/default_volume_tables.xml:system/etc/default_volume_tables.xml \ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:system/etc/default_volume_tables.xml \
# May need to review why the followings are needed in generic system image. # May need to review why the followings are needed in generic system image.
PRODUCT_COPY_FILES := \ PRODUCT_COPY_FILES += \
device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml