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
This commit is contained in:
Bruno Martins
2024-09-09 00:16:08 +01:00
committed by chaptsand
parent 205813f6bd
commit e016300ea1
2 changed files with 4 additions and 2 deletions

View File

@@ -34,6 +34,7 @@ AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true
BOARD_SUPPORTS_OPENSOURCE_STHAL := true BOARD_SUPPORTS_OPENSOURCE_STHAL := true
BOARD_SUPPORTS_SOUND_TRIGGER := true BOARD_SUPPORTS_SOUND_TRIGGER := true
BOARD_USES_ALSA_AUDIO := true BOARD_USES_ALSA_AUDIO := true
TARGET_PROVIDES_AUDIO_HAL := true
TARGET_USES_QCOM_MM_AUDIO := true TARGET_USES_QCOM_MM_AUDIO := true
# Boot # Boot
@@ -60,7 +61,9 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
DEVICE_MANIFEST_FILE := \ DEVICE_MANIFEST_FILE := \
$(COMMON_PATH)/vintf/manifest_kalama.xml \ $(COMMON_PATH)/vintf/manifest_kalama.xml \
$(COMMON_PATH)/vintf/manifest_samsung.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 DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml

View File

@@ -27,7 +27,6 @@ PRODUCT_PACKAGES += \
android.hardware.bluetooth.audio-impl \ android.hardware.bluetooth.audio-impl \
android.hardware.soundtrigger@2.3-impl \ android.hardware.soundtrigger@2.3-impl \
audio.bluetooth.default \ audio.bluetooth.default \
audio.primary.kalama \
audio.r_submix.default \ audio.r_submix.default \
audio.usb.default \ audio.usb.default \
audioadsprpcd \ audioadsprpcd \