commit 3e6948961a926fe5741d96aee7e8db4a661b771e
author Kiet Lam <c_kietl@qca.qualcomm.com> Thu Mar 13 14:14:58 2014 -0700
committer Kiet Lam <c_kietl@qca.qualcomm.com> Thu Mar 13 16:56:37 2014 -0700
tree 93516241b6ec023c0a75249c51d90fa788444773
parent 77731d4a3431fecde30c1ab2941e98935f130487

wlan: Set Android.mk equals to CAF prima/Anroid.mk

Replaced Android.mk with external CAF prima/Android.mk

Change-Id: Ic3104c8326f83f71d50c4add12c5d296420131d9

Android.mk

diff --git a/Android.mk b/Android.mk
index 1a40144..845ef6b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,13 +4,13 @@
 WLAN_CHIPSET :=
 
 # Build/Package options for 8960 target
-ifeq ($(call is-board-platform,msm8960),true)
+ifeq ($(TARGET_BOARD_PLATFORM),msm8960)
 WLAN_CHIPSET := prima
 WLAN_SELECT := CONFIG_PRIMA_WLAN=m
 endif
 
 # Build/Package options for 8974, 8226, 8610 targets
-ifeq ($(call is-board-platform-in-list,msm8916 msm8974 msm8226 msm8610),true)
+ifneq (,$(filter msm8974 msm8226 msm8610,$(TARGET_BOARD_PLATFORM)))
 WLAN_CHIPSET := pronto
 WLAN_SELECT := CONFIG_PRONTO_WLAN=m
 endif
@@ -31,13 +31,13 @@
 endif
 
 ifeq ($(WLAN_PROPRIETARY),1)
-    WLAN_BLD_DIR := vendor/qcom/proprietary/wlan-noship
+    WLAN_BLD_DIR := vendor/qcom/proprietary/wlan
 else
     WLAN_BLD_DIR := vendor/qcom/opensource/wlan
 endif
 
 # DLKM_DIR was moved for JELLY_BEAN (PLATFORM_SDK 16)
-ifeq ($(call is-platform-sdk-version-at-least,16),true)
+ifeq (1,$(filter 1,$(shell echo "$$(( $(PLATFORM_SDK_VERSION) >= 16 ))" )))
        DLKM_DIR := $(TOP)/device/qcom/common/dlkm
 else
        DLKM_DIR := build/dlkm
@@ -90,15 +90,24 @@
 KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)
 KBUILD_OPTIONS += $(WLAN_SELECT)
 
+
+VERSION=$(shell grep -w "VERSION =" $(TOP)/kernel/Makefile | sed 's/^VERSION = //' )
+PATCHLEVEL=$(shell grep -w "PATCHLEVEL =" $(TOP)/kernel/Makefile | sed 's/^PATCHLEVEL = //' )
+
 include $(CLEAR_VARS)
-LOCAL_MODULE              := proprietary_$(WLAN_CHIPSET)_wlan.ko
+LOCAL_MODULE              := $(WLAN_CHIPSET)_wlan.ko
 LOCAL_MODULE_KBUILD_NAME  := wlan.ko
-LOCAL_MODULE_TAGS         := optional
+LOCAL_MODULE_TAGS         := debug
 LOCAL_MODULE_DEBUG_ENABLE := true
 LOCAL_MODULE_PATH         := $(TARGET_OUT)/lib/modules/$(WLAN_CHIPSET)
 include $(DLKM_DIR)/AndroidKernelModule.mk
 ###########################################################
 
+#Create symbolic link
+$(shell mkdir -p $(TARGET_OUT)/lib/modules; \
+        ln -sf /system/lib/modules/$(WLAN_CHIPSET)/$(WLAN_CHIPSET)_wlan.ko \
+               $(TARGET_OUT)/lib/modules/wlan.ko)
+
 endif # DLKM check
 
 endif # supported target check