summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYue Ma <yuem@codeaurora.org>2016-04-20 12:46:03 -0700
committerVishwajith Upendra <vishwaji@codeaurora.org>2016-04-21 11:08:11 -0700
commit188f59ac35cfb4f3b059367af1f2334f3f513ea6 (patch)
tree706a293c611bfe968fcabc1fb73b9f8732ad974c
parent0eb0b3d600d54af2b457dca87fce61c9239d212a (diff)
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
-rw-r--r--Android.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 69e91dc99641..1454e42d94fa 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 <chipset>_wlan.ko as LOCAL_MODULE.