qcacld-3.0: Kbuild: Cleanup UMAC_INTERFACE_MGR_OBJS logic

Currently UMAC_INTERFACE_MGR_OBJS are added to OBJS when
CONFIG_INTERFACE_MGR is enabled.  An upcoming change requires that
assignments to OBJS be unconditional, so relocate the condition to
wrap the assignment of UMAC_INTERFACE_MGR_OBJS.

Change-Id: Ibfac21851b6a27a532cbe28a9be86909ea093e5d
CRs-Fixed: 2874549
This commit is contained in:
Jeff Johnson 2021-02-04 14:39:27 -08:00 • committed by snandini
commit d2f6c5f0ef

4
Kbuild
View file

@ -1080,11 +1080,13 @@ UMAC_INTERFACE_MGR_CMN_DIR := $(WLAN_COMMON_ROOT)/umac/cmn_services/interface_mg
UMAC_INTERFACE_MGR_INC := -I$(WLAN_COMMON_INC)/umac/cmn_services/interface_mgr/inc \
-I$(WLAN_ROOT)/components/cmn_services/interface_mgr/inc
ifeq ($(CONFIG_INTERFACE_MGR), y)
UMAC_INTERFACE_MGR_OBJS := $(UMAC_INTERFACE_MGR_CMN_DIR)/src/wlan_if_mgr_main.o \
$(UMAC_INTERFACE_MGR_CMN_DIR)/src/wlan_if_mgr_core.o \
$(UMAC_INTERFACE_MGR_COMP_DIR)/src/wlan_if_mgr_sta.o \
$(UMAC_INTERFACE_MGR_COMP_DIR)/src/wlan_if_mgr_sap.o \
$(UMAC_INTERFACE_MGR_COMP_DIR)/src/wlan_if_mgr_roam.o
endif
########## POWER MANAGEMENT OFFLOADS (PMO) ##########
PMO_DIR := components/pmo
@ -2492,9 +2494,7 @@ OBJS += $(UMAC_GPIO_OBJS)
OBJS += $(UMAC_GREEN_AP_OBJS)
OBJS += $(UMAC_CRYPTO_OBJS)
OBJS += $(DP_OBJS)
ifeq ($(CONFIG_INTERFACE_MGR), y)
OBJS += $(UMAC_INTERFACE_MGR_OBJS)
endif
OBJS += $(TXRX3.0_OBJS)
ccflags-y += $(INCS)