diff options
author | Vinit Deshpande <vinitd@google.com> | 2015-04-14 16:24:00 -0700 |
---|---|---|
committer | Vinit Deshpande <vinitd@google.com> | 2015-04-14 16:24:00 -0700 |
commit | a3774bd56a315593c9af76637dccbd396a0b8c5a (patch) | |
tree | 2be9ccc90f077a22104e55cda67302aef8cd7f0c /qcwcn/wifi_hal/Android.mk | |
parent | 5cf54efc97685e5704395d9953d2164e3391ddf3 (diff) | |
parent | c31ec43dd246e3322b7248351eef561bb756e495 (diff) | |
download | wlan-a3774bd56a315593c9af76637dccbd396a0b8c5a.tar.gz |
am 4af494a..c31ec43 from mirror-m-wireless-internal-release
c31ec43 Wi-Fi HAL: Changes in ePNO and Passpoint list
e5c1439 Wi-Fi HAL: new API changes for ePNO
2612746 Wi-Fi HAL: new API changes for GScan and Hotlist SSID
a4fb688 Wi-Fi HAL : support for new parameters added in link_layer_stats.h
34bf325 Wi-Fi HAL: Support for Roaming APIs
d4ea275 Wi-Fi HAL: add support for Wi-Fi Config through HAL
c7edb1c Wi-Fi HAL: add new QCA specific commands and attributes
f1f0e60 wpa_supplicant_private_lib: driver_nl80211.h inclusion changed
Change-Id: Ic7a0b778faf130de3e6f9897d40a71880acfd731
Diffstat (limited to 'qcwcn/wifi_hal/Android.mk')
-rw-r--r-- | qcwcn/wifi_hal/Android.mk | 55 |
1 files changed, 54 insertions, 1 deletions
diff --git a/qcwcn/wifi_hal/Android.mk b/qcwcn/wifi_hal/Android.mk index 4df48e9..f7c75dc 100644 --- a/qcwcn/wifi_hal/Android.mk +++ b/qcwcn/wifi_hal/Android.mk @@ -21,6 +21,7 @@ include $(CLEAR_VARS) LOCAL_CFLAGS := -Wno-unused-parameter LOCAL_C_INCLUDES += \ + $(LOCAL_PATH) \ external/libnl/include \ $(call include-path-for, libhardware_legacy)/hardware_legacy \ external/wpa_supplicant_8/src/drivers \ @@ -34,7 +35,14 @@ LOCAL_SRC_FILES := \ llstats.cpp \ gscan.cpp \ gscan_event_handler.cpp \ - rtt.cpp + rtt.cpp \ + ifaceeventhandler.cpp \ + tdls.cpp \ + nan.cpp \ + nan_ind.cpp \ + nan_req.cpp \ + nan_rsp.cpp \ + wificonfig.cpp LOCAL_MODULE := libwifi-hal-qcom LOCAL_SHARED_LIBRARIES += libnetutils liblog @@ -49,3 +57,48 @@ endif include $(BUILD_STATIC_LIBRARY) +include $(CLEAR_VARS) + +LOCAL_REQUIRED_MODULES := + +LOCAL_CFLAGS += -Wno-unused-parameter +LOCAL_CFLAGS += -DNAN_2_0 +LOCAL_CPPFLAGS += -Wno-conversion-null + +LOCAL_C_INCLUDES += \ + $(LOCAL_PATH) \ + external/libnl/include \ + $(call include-path-for, libhardware_legacy)/hardware_legacy \ + external/wpa_supplicant_8/src/drivers \ + $(TARGET_OUT_HEADERS)/libwpa_client \ + $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include + +LOCAL_SRC_FILES := \ + wifi_hal.cpp \ + common.cpp \ + cpp_bindings.cpp \ + llstats.cpp \ + gscan.cpp \ + gscan_event_handler.cpp \ + rtt.cpp \ + ifaceeventhandler.cpp \ + tdls.cpp \ + nan.cpp \ + nan_ind.cpp \ + nan_req.cpp \ + nan_rsp.cpp \ + wificonfig.cpp + +LOCAL_MODULE := libwifi-hal-qcom +LOCAL_SHARED_LIBRARIES += libnetutils liblog +LOCAL_SHARED_LIBRARIES += libdl libhardware_legacy + +ifneq ($(wildcard external/libnl),) +LOCAL_SHARED_LIBRARIES += libnl +LOCAL_C_INCLUDES += external/libnl/include +else +LOCAL_SHARED_LIBRARIES += libnl_2 +LOCAL_C_INCLUDES += external/libnl-headers +endif + +include $(BUILD_SHARED_LIBRARY) |