sm8450-common: Work around using prebuilt audio primary HAL

Since audio.primary.taro is no longer present in PRODUCT_PACKAGES,
the vintf files are not copied anymore, so account for that and merge
to the manifest instead.

Change-Id: I71b091950e5ecc810779d3ab51e99807d6648d0b

BoardConfigCommon.mk

@@ -54,6 +54,7 @@ AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
 
 BOARD_SUPPORTS_OPENSOURCE_STHAL := true
 
+TARGET_PROVIDES_AUDIO_HAL ?= true
 TARGET_USES_QCOM_MM_AUDIO := true
 
 # Boot control
@@ -232,6 +233,7 @@ $(foreach sku, $(call to-upper, $(DEVICE_MANIFEST_SKUS)), \
         $(COMMON_PATH)/vintf/manifest.xml \
         $(COMMON_PATH)/vintf/manifest_xiaomi.xml \
         $(if $(TARGET_NFC_SUPPORTED_SKUS),$(COMMON_PATH)/vintf/manifest_no_nfc.xml,) \
+        $(if $(TARGET_PROVIDES_AUDIO_HAL),hardware/qcom-caf/sm8450/audio/primary-hal/configs/common/manifest_non_qmaa.xml,) \
     ))
 
 ifneq ($(TARGET_NFC_SUPPORTED_SKUS),)

common.mk

@@ -58,7 +58,6 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_PACKAGES += \
     audio.bluetooth.default:64 \
-    audio.primary.taro:64 \
     audio.r_submix.default:64 \
     audio.usb.default:64 \
     sound_trigger.primary.taro:64