From 188f59ac35cfb4f3b059367af1f2334f3f513ea6 Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Wed, 20 Apr 2016 12:46:03 -0700 Subject: [PATCH] qcacld-3.0: Correct common project header files path Under new kernel tree structure, the kernel can be either directly under build_root/kernel or in a subdirectory within it. The WLAN module has a hard coded assumption for the header files path of newly added common project. Hence add the change to correct it based on KERNEL_TO_BUILD_ROOT_OFFSET. Change-Id: Ibe3a61a62cd2b2cea65c5a14f2bf70b998787f54 CRs-fixed: 992940 --- Android.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index 69e91dc996..1454e42d94 100644 --- a/Android.mk +++ b/Android.mk @@ -42,9 +42,8 @@ endif # platform-sdk-version ########################################################### # This is set once per LOCAL_PATH, not per (kernel) module KBUILD_OPTIONS := WLAN_ROOT=$(KERNEL_TO_BUILD_ROOT_OFFSET)$(WLAN_BLD_DIR)/qcacld-3.0 -KBUILD_OPTIONS += WLAN_COMMON_ROOT=../../../opensource/wlan/qca-wifi-host-cmn -KBUILD_OPTIONS += WLAN_COMMON_INC=../vendor/qcom/opensource/wlan/qca-wifi-host-cmn - +KBUILD_OPTIONS += WLAN_COMMON_ROOT=../qca-wifi-host-cmn +KBUILD_OPTIONS += WLAN_COMMON_INC=$(KERNEL_TO_BUILD_ROOT_OFFSET)$(WLAN_BLD_DIR)/qca-wifi-host-cmn # We are actually building wlan.ko here, as per the # requirement we are specifying _wlan.ko as LOCAL_MODULE.