diff options
| author | Amarnath Hullur Subramanyam <amarnath@qca.qualcomm.com> | 2015-03-27 00:15:27 -0700 |
|---|---|---|
| committer | Amarnath Hullur Subramanyam <amarnath@qca.qualcomm.com> | 2015-03-27 01:28:27 -0700 |
| commit | 4af494a4400d1ee3944e227626d0452e033284d5 (patch) | |
| tree | 26a5459ec0d1551a0d1205e075b295867e375d74 /qcwcn/wifi_hal/Android.mk | |
| parent | 91840a20fc7e54c2aa2393b982a0abc85baa8299 (diff) | |
| download | wlan-4af494a4400d1ee3944e227626d0452e033284d5.tar.gz | |
Fast forwarding all the changes till tip of l release.
Change-Id: I2eabf5c9d14a33e11e6fefaf54d70ac972292a55
Diffstat (limited to 'qcwcn/wifi_hal/Android.mk')
| -rw-r--r-- | qcwcn/wifi_hal/Android.mk | 56 |
1 files changed, 54 insertions, 2 deletions
diff --git a/qcwcn/wifi_hal/Android.mk b/qcwcn/wifi_hal/Android.mk index 54ef41a..2ee9d6b 100644 --- a/qcwcn/wifi_hal/Android.mk +++ b/qcwcn/wifi_hal/Android.mk @@ -21,10 +21,11 @@ include $(CLEAR_VARS) LOCAL_REQUIRED_MODULES := LOCAL_CFLAGS += -Wno-unused-parameter -Wno-int-to-pointer-cast -LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses +LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses -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 \ @@ -38,10 +39,17 @@ 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 LOCAL_MODULE := libwifi-hal-qcom LOCAL_SHARED_LIBRARIES += libnetutils liblog +LOCAL_SHARED_LIBRARIES += libdl ifneq ($(wildcard external/libnl),) LOCAL_SHARED_LIBRARIES += libnl @@ -53,3 +61,47 @@ endif include $(BUILD_STATIC_LIBRARY) +include $(CLEAR_VARS) + +LOCAL_REQUIRED_MODULES := + +LOCAL_CFLAGS += -Wno-unused-parameter -Wno-int-to-pointer-cast +LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses -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 + +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) |