commit d03d98a55931c52ad8b15d00e61d1b8efa597bb2
author Hao Chen <chenhaosjtuacm@google.com> Mon Jul 11 23:43:07 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 11 23:43:07 2022 +0000
tree 7f8d17f94462d0178a5ca020b3be5ed9daec0eb9
parent 016149d93d570f6e0a238a8b658301b897092d28
parent 9af1d3d6697162317dba13b5b0fb0776e4ca1e53

Update Audio HAL Package Copy files am: 9af1d3d669

Original change: https://partner-android-review.googlesource.com/c/device/google/trout/+/2248441

Change-Id: Id65a9f124460717dd9dfd5797e3e948e86684291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

aosp_trout_common.mk

diff --git a/aosp_trout_common.mk b/aosp_trout_common.mk
index ac4a3c9..0b73724 100644
--- a/aosp_trout_common.mk
+++ b/aosp_trout_common.mk
@@ -19,17 +19,7 @@
 
 PRODUCT_PACKAGE_OVERLAYS += device/google/trout/product_files/overlay
 
-ifeq ($(TARGET_USES_CUTTLEFISH_AUDIO),true)
-# Cuttlefish Audio HAL with custom configuration
-ifndef LOCAL_AUDIO_PRODUCT_COPY_FILES
-LOCAL_AUDIO_PRODUCT_COPY_FILES := \
-    device/google/cuttlefish/shared/config/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \
-    frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
-    device/google/trout/product_files/vendor/etc/primary_audio_policy_configuration.cf.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml
-endif
-
-LOCAL_AUDIO_PROPERTIES ?=
-else
+ifeq ($(TARGET_USES_CUTTLEFISH_AUDIO),false)
 # Car Emulator Audio HAL
 LOCAL_AUDIO_PRODUCT_PACKAGE ?= \
     audio.primary.caremu \

product_files/vendor/etc/primary_audio_policy_configuration.cf.xml

diff --git a/product_files/vendor/etc/primary_audio_policy_configuration.cf.xml b/product_files/vendor/etc/primary_audio_policy_configuration.cf.xml
deleted file mode 100644
index 2b5aad5..0000000
--- a/product_files/vendor/etc/primary_audio_policy_configuration.cf.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Audio HAL override for trout using Cuttlefish Audio HAL -->
-<module name="primary" halVersion="2.0">
-    <attachedDevices>
-        <item>Speaker</item>
-        <item>Built-In Mic</item>
-    </attachedDevices>
-    <defaultOutputDevice>Speaker</defaultOutputDevice>
-    <mixPorts>
-        <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
-            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-        </mixPort>
-        <mixPort name="primary input" role="sink">
-            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-        </mixPort>
-   </mixPorts>
-   <devicePorts>
-        <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
-        </devicePort>
-
-        <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
-        </devicePort>
-    </devicePorts>
-    <routes>
-        <route type="mix" sink="Speaker"
-               sources="primary output"/>
-        <route type="mix" sink="primary input"
-               sources="Built-In Mic"/>
-    </routes>
-</module>