commit 57fb2214aba65f120143675d2c5b039df68f5240
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 14 09:06:44 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 14 09:06:45 2017 +0000
tree f303c87c529df6b906a29b23b79b643642859a85
parent 34d8c95fd77176a20f4b570e33395e05bf8d8480
parent 56d68a51924160493ac7590bead1ad1f6a0f58fe

Merge "Add more libs into generic AOSP system image" into oc-dev

target/product/treble_common.mk

diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk
index d4e8dc1..f527de9 100644
--- a/target/product/treble_common.mk
+++ b/target/product/treble_common.mk
@@ -199,14 +199,13 @@
 # The following policy XML files are used as fallback for
 # vendors/devices not using XML to configure audio policy.
 PRODUCT_COPY_FILES += \
-    frameworks/av/services/audiopolicy/config/audio_policy_configuration.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/usb_audio_policy_configuration.xml:system/etc/usb_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/primary_audio_policy_configuration.xml:system/etc/primary_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/default_volume_tables.xml:system/etc/default_volume_tables.xml \
 
 # 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