summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2013-11-16 02:39:54 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2013-11-16 02:39:54 -0800
commitcba53bb8875a2109e1f05d138eca51609d88a1f7 (patch)
tree96d99f6512b8372e0cb6ece6c71312def19fdd5b /Android.mk
parentafa425f1d64b28581c8980afeed253d092e4b9f9 (diff)
parente81981aa12a5824d211f5e262acfcc0b8b9692be (diff)
Merge "Merge remote-tracking branch 'origin/caf/caf-wlan/master'"
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk
index b611ae74c870..ef9927de11c7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,7 +31,7 @@ else
WLAN_BLD_DIR := vendor/qcom/opensource/wlan
endif
-ifeq ($(call is-android-codename,JELLY_BEAN),true)
+ifeq ($(call is-platform-sdk-version-at-least,16),true)
DLKM_DIR := $(TOP)/device/qcom/common/dlkm
else
DLKM_DIR := build/dlkm
@@ -49,12 +49,12 @@ KBUILD_OPTIONS += $(WLAN_SELECT)
KBUILD_OPTIONS += $(WLAN_ISOC_SELECT)
include $(CLEAR_VARS)
-#LOCAL_MODULE := proprietary_$(WLAN_CHIPSET)_wlan.ko
-#LOCAL_MODULE_KBUILD_NAME := wlan.ko
-#LOCAL_MODULE_TAGS := debug
-#LOCAL_MODULE_DEBUG_ENABLE := true
-#LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/modules/$(WLAN_CHIPSET)
-#include $(DLKM_DIR)/AndroidKernelModule.mk
+LOCAL_MODULE := $(WLAN_CHIPSET)_wlan.ko
+LOCAL_MODULE_KBUILD_NAME := wlan.ko
+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