qcacld-3.0: Install WLAN modules to KERNEL_MODULES_OUT
Add support to install WLAN module to KERNEL_MODULES_OUT. During full treble build, modules installed directly in the vendor locations gets wiped out during the build process. CRs-Fixed: 2076401 Change-Id: I8229708da7c4d1a1c366b5b305f481ccb52f3833
This commit is contained in:

committed by
snandini

parent
919683e1eb
commit
64271516af
24
Android.mk
24
Android.mk
@@ -50,17 +50,37 @@ LOCAL_MODULE := $(WLAN_CHIPSET)_wlan.ko
|
|||||||
LOCAL_MODULE_KBUILD_NAME := wlan.ko
|
LOCAL_MODULE_KBUILD_NAME := wlan.ko
|
||||||
LOCAL_MODULE_TAGS := debug
|
LOCAL_MODULE_TAGS := debug
|
||||||
LOCAL_MODULE_DEBUG_ENABLE := true
|
LOCAL_MODULE_DEBUG_ENABLE := true
|
||||||
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/modules/$(WLAN_CHIPSET)
|
ifeq ($(PRODUCT_VENDOR_MOVE_ENABLED),true)
|
||||||
|
ifeq ($(WIFI_DRIVER_INSTALL_TO_KERNEL_OUT),true)
|
||||||
|
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
|
||||||
|
else
|
||||||
|
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/$(WLAN_CHIPSET)
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/modules/$(WLAN_CHIPSET)
|
||||||
|
endif
|
||||||
|
|
||||||
include $(DLKM_DIR)/AndroidKernelModule.mk
|
include $(DLKM_DIR)/AndroidKernelModule.mk
|
||||||
###########################################################
|
###########################################################
|
||||||
|
|
||||||
# Create Symbolic link
|
# Create Symbolic link
|
||||||
ifneq ($(findstring $(WLAN_CHIPSET),$(WIFI_DRIVER_DEFAULT)),)
|
ifneq ($(findstring $(WLAN_CHIPSET),$(WIFI_DRIVER_DEFAULT)),)
|
||||||
|
ifeq ($(PRODUCT_VENDOR_MOVE_ENABLED),true)
|
||||||
|
ifneq ($(WIFI_DRIVER_INSTALL_TO_KERNEL_OUT),)
|
||||||
|
$(shell mkdir -p $(TARGET_OUT_VENDOR)/lib/modules; \
|
||||||
|
ln -sf /system/lib/modules/$(WLAN_CHIPSET)/$(LOCAL_MODULE) $(TARGET_OUT_VENDOR)/lib/modules/wlan.ko)
|
||||||
|
endif
|
||||||
|
else
|
||||||
$(shell mkdir -p $(TARGET_OUT)/lib/modules; \
|
$(shell mkdir -p $(TARGET_OUT)/lib/modules; \
|
||||||
ln -sf /system/lib/modules/$(WLAN_CHIPSET)/$(LOCAL_MODULE) $(TARGET_OUT)/lib/modules/wlan.ko)
|
ln -sf /system/lib/modules/$(WLAN_CHIPSET)/$(LOCAL_MODULE) $(TARGET_OUT)/lib/modules/wlan.ko)
|
||||||
endif
|
endif
|
||||||
$(shell ln -sf /persist/wlan_mac.bin $(TARGET_OUT_ETC)/firmware/wlan/qca_cld/wlan_mac.bin)
|
endif
|
||||||
|
|
||||||
|
ifeq ($(PRODUCT_VENDOR_MOVE_ENABLED),true)
|
||||||
|
$(shell ln -sf /persist/wlan_mac.bin $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld/wlan_mac.bin)
|
||||||
|
else
|
||||||
|
$(shell ln -sf /persist/wlan_mac.bin $(TARGET_OUT_ETC)/firmware/wlan/qca_cld/wlan_mac.bin)
|
||||||
|
endif
|
||||||
endif # DLKM check
|
endif # DLKM check
|
||||||
endif # supported target check
|
endif # supported target check
|
||||||
endif # WLAN enabled check
|
endif # WLAN enabled check
|
||||||
|
Reference in New Issue
Block a user