commit a7c2da3ebb778a583284e305fd98ded0feebc93e
author Amit Pundir <amit.pundir@linaro.org> Mon Jan 31 22:26:29 2022 +0530
committer Caleb Connolly <caleb.connolly@protonmail.com> Mon Jan 31 17:27:15 2022 +0000
tree 12392b468cae4a8352996bdc2c97d6c0c8e2e42c
parent 38bb825f3b9eaef8d400917f5e11f7d9b9822f37

Fix tinyhal / audio configuration

tinyhal loads audio.$(getprop ro.product.device).xml
configuration file for audio mixer control and routing
changes. So copy audio.sdm845.xml accordingly.

Fixes: 298ae955c9b8 ("Remove sdm845-userdebug build target")
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

axolotl/device.mk

diff --git a/axolotl/device.mk b/axolotl/device.mk
index 7b2ffbd..2cf4300 100644
--- a/axolotl/device.mk
+++ b/axolotl/device.mk
@@ -17,6 +17,7 @@
 PRODUCT_COPY_FILES := \
     $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.axolotl \
     $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.axolotl \
+    device/generic/sdm845/etc/audio.sdm845.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio.axolotl.xml \
     device/generic/sdm845/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.axolotl.rc \
     device/generic/sdm845/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.axolotl.usb.rc \
     device/generic/sdm845/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/axolotl.kl

beryllium/device.mk

diff --git a/beryllium/device.mk b/beryllium/device.mk
index 92319a0..4350143 100644
--- a/beryllium/device.mk
+++ b/beryllium/device.mk
@@ -17,6 +17,7 @@
 PRODUCT_COPY_FILES := \
     $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.beryllium \
     $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.beryllium \
+    device/generic/sdm845/etc/audio.sdm845.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio.beryllium.xml \
     device/generic/sdm845/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.beryllium.rc \
     device/generic/sdm845/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.beryllium.usb.rc \
     device/generic/sdm845/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/beryllium.kl

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index ca555a5..a8267ca 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -135,7 +135,6 @@
 # audio policy configuration
 USE_XML_AUDIO_POLICY_CONF := 1
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/etc/audio.sdm845.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio.sdm845.xml \
     $(LOCAL_PATH)/etc/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
     $(LOCAL_PATH)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \
     frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \

enchilada/device.mk

diff --git a/enchilada/device.mk b/enchilada/device.mk
index 9b87fee..7db8f1c 100644
--- a/enchilada/device.mk
+++ b/enchilada/device.mk
@@ -17,6 +17,7 @@
 PRODUCT_COPY_FILES := \
     $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.enchilada \
     $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.enchilada \
+    device/generic/sdm845/etc/audio.sdm845.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio.enchilada.xml \
     device/generic/sdm845/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.enchilada.rc \
     device/generic/sdm845/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.enchilada.usb.rc \
     device/generic/sdm845/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/enchilada.kl