diff options
| author | Sameer Thalappil <sameert@codeaurora.org> | 2017-07-12 16:36:04 -0700 |
|---|---|---|
| committer | snandini <snandini@codeaurora.org> | 2017-07-18 10:43:44 -0700 |
| commit | 494dfeb8931f4f0be29fe522fbf46321ebe5ccac (patch) | |
| tree | bad5186f25ae77165f61fe89beb0c617fb684ba0 /Android.mk | |
| parent | a025746cc7b78ea3c9455a7149a227a15188ba53 (diff) | |
| download | qcacld-494dfeb8931f4f0be29fe522fbf46321ebe5ccac.tar.gz | |
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
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 1f63f92bb3..3a57cb36fd 100644 --- a/Android.mk +++ b/Android.mk @@ -52,23 +52,31 @@ LOCAL_MODULE_KBUILD_NAME := wlan.ko LOCAL_MODULE_TAGS := optional LOCAL_MODULE_DEBUG_ENABLE := true ifeq ($(PRODUCT_VENDOR_MOVE_ENABLED),true) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/modules/$(WLAN_CHIPSET) + 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) + LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/modules/$(WLAN_CHIPSET) endif + include $(DLKM_DIR)/AndroidKernelModule.mk ########################################################### # Create Symbolic link 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; \ ln -sf /system/lib/modules/$(WLAN_CHIPSET)/$(LOCAL_MODULE) $(TARGET_OUT)/lib/modules/wlan.ko) endif 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 |