From 7f5a985687381c9796dce53885881e34a1de20fb Mon Sep 17 00:00:00 2001 From: Albert Tang Date: Tue, 31 May 2022 18:26:31 -0500 Subject: [PATCH] dre: Import audio configs from LA.UM.9.14.r1-19200.02-LAHAINA.QSSI13.0 The SM8350 audio HAL has SM4350 configuration files, so we will just import those. Any configurations not imported from there were pulled from OOS 11.0.6.0.DE17AA. Change-Id: I2bed70eba6b08d63b3bcc15c93ed1fc54ea0a770 --- audio/audio_effects.xml | 144 ------ audio/audio_io_policy.conf | 22 +- audio/audio_platform_info_intcodec.xml | 223 ++++----- audio/audio_policy_configuration.xml | 449 ----------------- audio/audio_tuning_mixer.txt | 261 ---------- ...hearing_aid_audio_policy_configuration.xml | 38 -- audio/sound_trigger_mixer_paths.xml | 172 ++----- audio/sound_trigger_platform_info.xml | 470 ------------------ device.mk | 39 +- 9 files changed, 154 insertions(+), 1664 deletions(-) delete mode 100644 audio/audio_effects.xml delete mode 100644 audio/audio_policy_configuration.xml delete mode 100644 audio/audio_tuning_mixer.txt delete mode 100644 audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml delete mode 100644 audio/sound_trigger_platform_info.xml diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml deleted file mode 100644 index b2620d7..0000000 --- a/audio/audio_effects.xml +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/audio_io_policy.conf b/audio/audio_io_policy.conf index eb8805f..337c70b 100644 --- a/audio/audio_io_policy.conf +++ b/audio/audio_io_policy.conf @@ -13,7 +13,7 @@ outputs { #ifdef VENDOR_EDIT #if OP_FEATURE_MM_24BIT == 1 -#liuhaituo@MM.Audio, 2019/07/15, use 24bit to playback +#zhangyu@MM.Audio, 2021/01/28, Use 24bit to playback default { flags AUDIO_OUTPUT_FLAG_PRIMARY formats AUDIO_FORMAT_PCM_24_BIT_PACKED @@ -47,7 +47,7 @@ outputs { } #ifdef VENDOR_EDIT #if OP_FEATURE_MM_24BIT == 1 -#liuhaituo@MM.Audio, 2019/07/15, use 24bit to playback +#zhangyu@MM.Audio, 2021/01/28, Use 24bit to playback deep_buffer { flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER formats AUDIO_FORMAT_PCM_24_BIT_PACKED @@ -112,12 +112,7 @@ outputs { inputs { record_16bit { formats AUDIO_FORMAT_PCM_16_BIT - #ifndef VENDOR_EDIT - #yewenliang@MM.Audio, 2020/04/09, remove 11025 series sample rate for normal record - #sampling_rates 8000|16000|32000|44100|48000|88200|96000|176400|192000 - #else - sampling_rates 8000|16000|32000|48000 - #endif + sampling_rates 8000|16000|32000|44100|48000|88200|96000|176400|192000 bit_width 16 app_type 69938 } @@ -136,12 +131,7 @@ inputs { record_compress_16 { flags AUDIO_INPUT_FLAG_COMPRESS formats AUDIO_FORMAT_PCM_16_BIT - #ifndef VENDOR_EDIT - #yewenliang@MM.Audio, 2020/12/30, remove 11025 series sample rate for compress record - #sampling_rates 8000|16000|32000|44100|48000|88200|96000|176400|192000 - #else - sampling_rates 8000|16000|32000|48000 - #endif + sampling_rates 8000|16000|32000|44100|48000|88200|96000|176400|192000 bit_width 16 app_type 69938 } @@ -167,10 +157,10 @@ inputs { app_type 69946 } low_latency_voip_tx { - flags AUDIO_INPUT_FLAG_VOIP_TX|AUDIO_INPUT_FLAG_FAST + flags AUDIO_INPUT_FLAG_FAST|AUDIO_INPUT_FLAG_VOIP_TX formats AUDIO_FORMAT_PCM_16_BIT sampling_rates 48000 bit_width 16 - app_type 69946 + app_type } } diff --git a/audio/audio_platform_info_intcodec.xml b/audio/audio_platform_info_intcodec.xml index fac9d7b..b628fdf 100644 --- a/audio/audio_platform_info_intcodec.xml +++ b/audio/audio_platform_info_intcodec.xml @@ -77,14 +77,13 @@ - + - + - @@ -93,13 +92,13 @@ - - + + + + - - - + @@ -107,14 +106,19 @@ - - - + - + + + + - + + + + + @@ -124,93 +128,45 @@ + - + + - + - - - - + + + + - - - - - - + + + + + + - - - + - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - + @@ -221,55 +177,50 @@ - - - - + + + + - - - - + - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + @@ -291,7 +242,6 @@ - @@ -313,6 +263,7 @@ + @@ -342,9 +293,9 @@ - - - + + + @@ -367,18 +318,20 @@ + - - - - - + + + + + - - - - - + + + + + + diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml deleted file mode 100644 index c2e78dd..0000000 --- a/audio/audio_policy_configuration.xml +++ /dev/null @@ -1,449 +0,0 @@ - - - - - - - - - - - - - - - - Earpiece - Speaker - Telephony Tx - Built-In Mic - Built-In Back Mic - FM Tuner - Telephony Rx - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/audio_tuning_mixer.txt b/audio/audio_tuning_mixer.txt deleted file mode 100644 index 7525ce4..0000000 --- a/audio/audio_tuning_mixer.txt +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of The Linux Foundation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#RAS_TEST_SPKR_PHONE_SPKR_STEREO -acdb_dev_id:136 -!Playback -Rxdevice:0 - -enable -WSA_CDC_DMA_RX_0 Channels:Two -WSA RX0 MUX:AIF1_PB -WSA RX1 MUX:AIF1_PB -WSA_RX0 INP0:RX0 -WSA_RX1 INP0:RX1 -WSA_COMP1 Switch:1 -WSA_COMP2 Switch:1 -SpkrLeft COMP Switch:1 -SpkrRight COMP Switch:1 -SpkrLeft VISENSE Switch:1 -SpkrRight VISENSE Switch:1 -SpkrLeft SWR DAC_Port Switch:1 -SpkrRight SWR DAC_Port Switch:1 -WSA_RX0 Digital Volume:62 -WSA_RX1 Digital Volume:62 -WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:1 - -disable -WSA RX0 MUX:ZERO -WSA RX1 MUX:ZERO -WSA_RX0 INP0:ZERO -WSA_RX1 INP0:ZERO -WSA_COMP1 Switch:0 -WSA_COMP2 Switch:0 -SpkrLeft COMP Switch:0 -SpkrRight COMP Switch:0 -SpkrLeft VISENSE Switch:0 -SpkrRight VISENSE Switch:0 -SpkrLeft SWR DAC_Port Switch:0 -SpkrRight SWR DAC_Port Switch:0 -WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:0 - -#SPKR_PHONE_SPKR_TX_FB_PROT -acdb_dev_id:102 -!Record -Txdevice:0 - -enable -WSA_AIF_VI Mixer WSA_SPKR_VI_1:1 -WSA_AIF_VI Mixer WSA_SPKR_VI_2:1 -WSA_CDC_DMA_0 TX Format:UNPACKED -VI_FEED_TX Channels:Two -WSA_RX_0_VI_FB_LCH_MUX:WSA_CDC_DMA_TX_0 -WSA_RX_0_VI_FB_RCH_MUX:WSA_CDC_DMA_TX_0 -MultiMedia1 Mixer WSA_CDC_DMA_TX_0:1 - - -disable -WSA_AIF_VI Mixer WSA_SPKR_VI_1:0 -WSA_AIF_VI Mixer WSA_SPKR_VI_2:0 -MultiMedia1 Mixer WSA_CDC_DMA_TX_0:0 - -#SPKR_PHONE_SPKR_STEREO_RX_FB_PROT -acdb_dev_id:124 -!Playback -Rxdevice:0 - -enable -WSA_CDC_DMA_RX_0 Channels:Two -WSA RX0 MUX:AIF1_PB -WSA RX1 MUX:AIF1_PB -WSA_RX0 INP0:RX0 -WSA_RX1 INP0:RX1 -WSA_COMP1 Switch:1 -WSA_COMP2 Switch:1 -SpkrLeft COMP Switch:1 -SpkrRight COMP Switch:1 -SpkrLeft VISENSE Switch:1 -SpkrRight VISENSE Switch:1 -SpkrLeft SWR DAC_Port Switch:1 -SpkrRight SWR DAC_Port Switch:1 -WSA_RX0 Digital Volume:62 -WSA_RX1 Digital Volume:62 -WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:1 - -disable -WSA RX0 MUX:ZERO -WSA RX1 MUX:ZERO -WSA_RX0 INP0:ZERO -WSA_RX1 INP0:ZERO -WSA_COMP1 Switch:0 -WSA_COMP2 Switch:0 -SpkrLeft COMP Switch:0 -SpkrRight COMP Switch:0 -SpkrLeft VISENSE Switch:0 -SpkrRight VISENSE Switch:0 -SpkrLeft SWR DAC_Port Switch:0 -SpkrRight SWR DAC_Port Switch:0 -WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:0 - -#SPKR_PHONE_SPKR_TX_FB_PROT_STEREO_MCS -acdb_dev_id:193 -!Record -Txdevice:0 - -enable -WSA_AIF_VI Mixer WSA_SPKR_VI_1:1 -WSA_AIF_VI Mixer WSA_SPKR_VI_2:1 -WSA_CDC_DMA_0 TX Format:UNPACKED -VI_FEED_TX Channels:Two -WSA_RX_0_VI_FB_LCH_MUX:WSA_CDC_DMA_TX_0 -WSA_RX_0_VI_FB_RCH_MUX:WSA_CDC_DMA_TX_0 -MultiMedia1 Mixer WSA_CDC_DMA_TX_0:1 - - -disable -WSA_AIF_VI Mixer WSA_SPKR_VI_1:0 -WSA_AIF_VI Mixer WSA_SPKR_VI_2:0 -MultiMedia1 Mixer WSA_CDC_DMA_TX_0:0 - -#SPKR_PHONE_SPKR_TX_FB_PROT_MONO_L_MCS -acdb_dev_id:194 -!Record -Txdevice:0 - -enable -WSA_AIF_VI Mixer WSA_SPKR_VI_1:1 -WSA_CDC_DMA_0 TX Format:UNPACKED -VI_FEED_TX Channels:One -WSA_RX_0_VI_FB_LCH_MUX:WSA_CDC_DMA_TX_0 -MultiMedia1 Mixer WSA_CDC_DMA_TX_0:1 - -disable -WSA_AIF_VI Mixer WSA_SPKR_VI_1:0 -MultiMedia1 Mixer WSA_CDC_DMA_TX_0:0 - -#SPKR_PHONE_SPKR_TX_FB_PROT_MONO_R_MCS -acdb_dev_id:195 -!Record -Txdevice:0 - -enable -WSA_AIF_VI Mixer WSA_SPKR_VI_2:1 -WSA_CDC_DMA_0 TX Format:UNPACKED -VI_FEED_TX Channels:One -WSA_RX_0_VI_FB_RCH_MUX:WSA_CDC_DMA_TX_0 -MultiMedia1 Mixer WSA_CDC_DMA_TX_0:1 - -disable -WSA_AIF_VI Mixer WSA_SPKR_VI_2:0 -MultiMedia1 Mixer WSA_CDC_DMA_TX_0:0 - -#SPKR_PHONE_SPKR_STEREO_RX_FB_PROT_MCS -acdb_dev_id:196 -!Playback -Rxdevice:0 - -enable -WSA_CDC_DMA_RX_0 Channels:Two -WSA RX0 MUX:AIF1_PB -WSA RX1 MUX:AIF1_PB -WSA_RX0 INP0:RX0 -WSA_RX1 INP0:RX1 -WSA_COMP1 Switch:1 -WSA_COMP2 Switch:1 -SpkrLeft COMP Switch:1 -SpkrRight COMP Switch:1 -SpkrLeft VISENSE Switch:1 -SpkrRight VISENSE Switch:1 -SpkrLeft SWR DAC_Port Switch:1 -SpkrRight SWR DAC_Port Switch:1 -WSA_RX0 Digital Volume:62 -WSA_RX1 Digital Volume:62 -WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:1 - -disable -WSA RX0 MUX:ZERO -WSA RX1 MUX:ZERO -WSA_RX0 INP0:ZERO -WSA_RX1 INP0:ZERO -WSA_COMP1 Switch:0 -WSA_COMP2 Switch:0 -SpkrLeft COMP Switch:0 -SpkrRight COMP Switch:0 -SpkrLeft VISENSE Switch:0 -SpkrRight VISENSE Switch:0 -SpkrLeft SWR DAC_Port Switch:0 -SpkrRight SWR DAC_Port Switch:0 -WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:0 - -#SPKR_PHONE_SPKR_MONO_L_RX_FB_PROT_MCS -acdb_dev_id:197 -!Playback -Rxdevice:0 - -enable -WSA_CDC_DMA_RX_0 Channels:One -WSA RX0 MUX:AIF1_PB -WSA_RX0 INP0:RX0 -WSA_COMP1 Switch:1 -SpkrLeft COMP Switch:1 -SpkrLeft VISENSE Switch:1 -SpkrLeft SWR DAC_Port Switch:1 -WSA_RX0 Digital Volume:62 -WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:1 - -disable -WSA RX0 MUX:ZERO -WSA_RX0 INP0:ZERO -WSA_COMP1 Switch:0 -SpkrLeft COMP Switch:0 -SpkrLeft VISENSE Switch:0 -SpkrLeft SWR DAC_Port Switch:0 -WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:0 - - -#SPKR_PHONE_SPKR_MONO_R_RX_FB_PROT_MCS -acdb_dev_id:198 -!Playback -Rxdevice:0 - -enable -WSA_CDC_DMA_RX_0 Channels:One -WSA RX1 MUX:AIF1_PB -WSA_RX1 INP0:RX1 -WSA_COMP2 Switch:1 -SpkrRight COMP Switch:1 -SpkrRight VISENSE Switch:1 -SpkrRight SWR DAC_Port Switch:1 -WSA_RX1 Digital Volume:62 -WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:1 - -disable -WSA RX1 MUX:ZERO -WSA_RX1 INP0:ZERO -WSA_COMP2 Switch:0 -SpkrRight COMP Switch:0 -SpkrRight VISENSE Switch:0 -SpkrRight SWR DAC_Port Switch:0 -WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:0 diff --git a/audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml b/audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml deleted file mode 100644 index 7707ae1..0000000 --- a/audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml index b5692d5..66f54b0 100644 --- a/audio/sound_trigger_mixer_paths.xml +++ b/audio/sound_trigger_mixer_paths.xml @@ -54,14 +54,8 @@ - - - - - - - - + + @@ -78,38 +72,13 @@ - - - + - - - - - - - - - - - - - - - - - - - - - - - @@ -178,118 +147,111 @@ + + + + + + + + + + + + + + + + - - - - + + + + + + + + + @@ -302,93 +264,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - - - + - - - - + + - + - + @@ -404,4 +309,5 @@ + diff --git a/audio/sound_trigger_platform_info.xml b/audio/sound_trigger_platform_info.xml deleted file mode 100644 index b583c8d..0000000 --- a/audio/sound_trigger_platform_info.xml +++ /dev/null @@ -1,470 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/device.mk b/device.mk index cc7b5a9..3e4df56 100644 --- a/device.mk +++ b/device.mk @@ -123,6 +123,7 @@ PRODUCT_PACKAGES += \ # Audio PRODUCT_PACKAGES += \ + android.hardware.audio@4.0.vendor \ android.hardware.audio@6.0-impl \ android.hardware.audio.effect@6.0-impl \ android.hardware.audio.service \ @@ -159,29 +160,31 @@ PRODUCT_PACKAGES += \ libvolumelistener \ sound_trigger.primary.holi:32 -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/audio_effects.xml \ - $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ - $(LOCAL_PATH)/audio/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/audio_io_policy.conf \ - $(LOCAL_PATH)/audio/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \ - $(LOCAL_PATH)/audio/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/audio_platform_info_intcodec.xml \ - $(LOCAL_PATH)/audio/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \ - $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/audio_policy_configuration.xml \ - $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - $(LOCAL_PATH)/audio/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/audio_tuning_mixer.txt \ - $(LOCAL_PATH)/audio/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \ - $(LOCAL_PATH)/audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_hearing_aid_audio_policy_configuration.xml \ - $(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/mixer_paths.xml \ - $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/sound_trigger_mixer_paths.xml \ - $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ - $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/sound_trigger_platform_info.xml \ - $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml +# SM8350 audio HAL has SM4350 configurations. +AUDIO_HAL_DIR := hardware/qcom-caf/sm8350/audio PRODUCT_COPY_FILES += \ - frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ + $(AUDIO_HAL_DIR)/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + $(AUDIO_HAL_DIR)/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/bluetooth_qti_audio_policy_configuration.xml \ + $(AUDIO_HAL_DIR)/configs/common/bluetooth_qti_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/bluetooth_qti_hearing_aid_audio_policy_configuration.xml \ + $(AUDIO_HAL_DIR)/configs/holi/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ + $(AUDIO_HAL_DIR)/configs/holi/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ + $(AUDIO_HAL_DIR)/configs/holi/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml \ + $(AUDIO_HAL_DIR)/configs/holi/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \ + $(AUDIO_HAL_DIR)/configs/holi/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \ + $(LOCAL_PATH)/audio/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \ + $(LOCAL_PATH)/audio/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \ + $(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ + $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml + +PRODUCT_COPY_FILES += \ + frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/audio_policy_volumes.xml \ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/default_volume_tables.xml \ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ + frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/r_submix_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/usb_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml # Authsecret