From ac77d67ad9eb1cd0ac2ac51e7b65379555b99c21 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sun, 22 Jun 2025 22:35:34 -0300 Subject: [PATCH] sm8550-common: Move and recategorize compat matrix and manifest flags Qualcomm also sets these in (common) product makefiles. Change-Id: I7139cba92454106fbca5f6105b966a43e70fe9d6 --- BoardConfigCommon.mk | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 3ca3ad3..292b0ab 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -53,20 +53,6 @@ TARGET_NEEDS_DTBOIMAGE := true # Filesystem TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/configs/config.fs -# HIDL -DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \ - $(COMMON_PATH)/vintf/device_framework_matrix.xml \ - hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml - -DEVICE_MANIFEST_FILE := \ - $(COMMON_PATH)/vintf/manifest_kalama.xml \ - $(COMMON_PATH)/vintf/manifest_samsung.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 - # Init Boot BOARD_INIT_BOOT_HEADER_VERSION := 4 BOARD_MKBOOTIMG_INIT_ARGS += --header_version $(BOARD_INIT_BOOT_HEADER_VERSION) @@ -194,6 +180,20 @@ BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 2 # Vibrator #$(call soong_config_set,samsungVibratorVars,duration_amplitude,true) +# VINTF +DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \ + $(COMMON_PATH)/vintf/device_framework_matrix.xml \ + hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml + +DEVICE_MANIFEST_FILE := \ + $(AUDIO_HAL_DIR)/configs/common/manifest_non_qmaa.xml \ + $(AUDIO_HAL_DIR)/configs/common/manifest_non_qmaa_extn.xml \ + $(COMMON_PATH)/vintf/manifest_kalama.xml \ + $(COMMON_PATH)/vintf/manifest_samsung.xml \ + $(COMMON_PATH)/vintf/radio_manifest.xml + +DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml + # WiFi BOARD_WLAN_DEVICE := qcwcn BOARD_HOSTAPD_DRIVER := NL80211