diff options
| author | Prakash Dhavali <pdhavali@codeaurora.org> | 2014-01-16 17:34:02 -0800 |
|---|---|---|
| committer | Prakash Dhavali <pdhavali@codeaurora.org> | 2014-01-16 17:34:02 -0800 |
| commit | ca7a486a8d4741b7053337cba35d3464aa6b5d80 (patch) | |
| tree | 5d0e787d9950a9411c2230d576a9784d00bbfd17 | |
| parent | ee26a888bf0a61e52469fc2b4fc68898d954d662 (diff) | |
| parent | a85639e3d967e4a2620458e5ea51d18028ec3f98 (diff) | |
Merge remote-tracking branch 'origin/caf/caf-wlan/master'
| -rw-r--r-- | Android.mk | 8 | ||||
| -rw-r--r-- | CORE/MAC/inc/qwlan_version.h | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 99070ec2547a..2738dd6a61d2 100644 --- a/Android.mk +++ b/Android.mk @@ -62,6 +62,14 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/modules/$(WLAN_CHIPSET) include $(DLKM_DIR)/AndroidKernelModule.mk ########################################################### +# Create Symbolic link for built <WLAN_CHIPSET>_wlan.ko driver from +# standard module location. +# TO-DO: This step needs to be moved to a post-build make target instead +# TO-DO: as this may run multiple times +$(shell mkdir -pv $(TARGET_OUT)/lib/modules; \ + ln -svf /system/lib/modules/$(WLAN_CHIPSET)/$(WLAN_CHIPSET)_wlan.ko \ + $(TARGET_OUT)/lib/modules/wlan.ko) + endif # DLKM check endif # supported target check diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h index 6edff7101a27..96e6baa38e77 100644 --- a/CORE/MAC/inc/qwlan_version.h +++ b/CORE/MAC/inc/qwlan_version.h @@ -40,9 +40,9 @@ BRIEF DESCRIPTION: #define QWLAN_VERSION_MAJOR 4 #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 0 -#define QWLAN_VERSION_EXTRA "C" +#define QWLAN_VERSION_EXTRA "D" #define QWLAN_VERSION_BUILD 68 -#define QWLAN_VERSIONSTR "4.0.0.68C" +#define QWLAN_VERSIONSTR "4.0.0.68D" #endif /* QWLAN_VERSION_H */ |