From 2f86dc249eb2d4d579cbd8310a08f91caa0fdcba Mon Sep 17 00:00:00 2001 From: Adithya R Date: Thu, 13 May 2021 16:01:09 +0530 Subject: [PATCH] audio/wlan: Fix makefile inclusion for sm6150 target Change-Id: Ifb5d4649d8b48e572f805edf582f67ed6fd5a067 --- audio/qti-audio.mk | 5 +++++ wlan/Android.mk | 5 ++++- wlan/qti-wlan.mk | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/audio/qti-audio.mk b/audio/qti-audio.mk index b77f6aa0..96afa55f 100644 --- a/audio/qti-audio.mk +++ b/audio/qti-audio.mk @@ -14,7 +14,12 @@ # Inherit from QSSI audio makefile. include $(TOPDIR)vendor/qcom/opensource/commonsys/audio/configs/qssi/qssi.mk + +ifeq ($(call is-board-platform-in-list,sm6150),true) +-include $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe/msmsteppe.mk +else -include $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/$(TARGET_BOARD_PLATFORM)/$(TARGET_BOARD_PLATFORM).mk +endif # Override proprietary definitions from SoC audio makefile. AUDIO_FEATURE_ENABLED_AHAL_EXT := false diff --git a/wlan/Android.mk b/wlan/Android.mk index 9e1c6c5d..35231895 100644 --- a/wlan/Android.mk +++ b/wlan/Android.mk @@ -18,9 +18,12 @@ ifneq (,$(filter wlan, $(TARGET_COMMON_QTI_COMPONENTS))) include $(CLEAR_VARS) --include device/qcom/wlan/$(TARGET_BOARD_PLATFORM)/AndroidBoardWlan.mk ifeq ($(call is-board-platform-in-list,msm8998 sdm660),true) -include device/qcom/wlan/sdm660_64/AndroidBoardWlan.mk +else ifeq ($(call is-board-platform-in-list,sm6150),true) +-include device/qcom/wlan/talos/AndroidBoardWlan.mk +else +-include device/qcom/wlan/$(TARGET_BOARD_PLATFORM)/AndroidBoardWlan.mk endif endif diff --git a/wlan/qti-wlan.mk b/wlan/qti-wlan.mk index bf44d4d8..66a58ac8 100644 --- a/wlan/qti-wlan.mk +++ b/wlan/qti-wlan.mk @@ -58,6 +58,8 @@ ifeq ($(call is-board-platform-in-list,sdm845),true) -include device/qcom/wlan/skunk/wlan.mk else ifeq ($(call is-board-platform-in-list,msm8998 sdm660),true) -include device/qcom/wlan/sdm660_64/wlan.mk +else ifeq ($(call is-board-platform-in-list,sm6150),true) +-include device/qcom/wlan/talos/wlan.mk else -include device/qcom/wlan/$(TARGET_BOARD_PLATFORM)/wlan.mk endif