From e016300ea11bce4bb0339eccb5c1d018ed742cbc Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Mon, 9 Sep 2024 00:16:08 +0100 Subject: [PATCH] sm8550-common: Work around using prebuilt audio primary HAL Since audio.primary.kalama 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 | 5 ++++- common.mk | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 7a2dde3..d17c2ec 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -34,6 +34,7 @@ AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true BOARD_SUPPORTS_OPENSOURCE_STHAL := true BOARD_SUPPORTS_SOUND_TRIGGER := true BOARD_USES_ALSA_AUDIO := true +TARGET_PROVIDES_AUDIO_HAL := true TARGET_USES_QCOM_MM_AUDIO := true # Boot @@ -60,7 +61,9 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \ DEVICE_MANIFEST_FILE := \ $(COMMON_PATH)/vintf/manifest_kalama.xml \ $(COMMON_PATH)/vintf/manifest_samsung.xml \ - $(COMMON_PATH)/vintf/radio_manifest.xml + $(COMMON_PATH)/vintf/radio_manifest.xml \ + hardware/qcom-caf/sm8550/audio/primary-hal/configs/common/manifest_non_qmaa.xml \ + hardware/qcom-caf/sm8550/audio/primary-hal/configs/common/manifest_non_qmaa_extn.xml DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml diff --git a/common.mk b/common.mk index 7758fb9..0c68423 100644 --- a/common.mk +++ b/common.mk @@ -27,7 +27,6 @@ PRODUCT_PACKAGES += \ android.hardware.bluetooth.audio-impl \ android.hardware.soundtrigger@2.3-impl \ audio.bluetooth.default \ - audio.primary.kalama \ audio.r_submix.default \ audio.usb.default \ audioadsprpcd \