summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Mahaveer <vishalm@ti.com>2015-06-10 22:24:34 -0500
committerVishal Mahaveer <vishalm@ti.com>2015-06-11 09:33:22 -0500
commit218a8312cf8a039b5555280aaa2f5f2d5d6f6ff5 (patch)
treec51f89153295171d2b3c1d8f1c9454a009fd51bf
parent0e08f3bddc5ab71d33502cb3feb99ab56d04e4c0 (diff)
downloadwlan-218a8312cf8a039b5555280aaa2f5f2d5d6f6ff5.tar.gz
wlan: ti-utils: fix Android build
Fix Android builds for libnl support. We usually don't build this component, but it gets built as part of "eng" builds. This change also fixes "eng" build. Change-Id: I3a86e16c4a9521f6a8bba5915054ed4d7599ac53 Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
-rw-r--r--mac80211/ti-utils/Android.mk14
1 files changed, 12 insertions, 2 deletions
diff --git a/mac80211/ti-utils/Android.mk b/mac80211/ti-utils/Android.mk
index 187b7062..c889f5b9 100644
--- a/mac80211/ti-utils/Android.mk
+++ b/mac80211/ti-utils/Android.mk
@@ -14,10 +14,20 @@ LOCAL_SRC_FILES := \
LOCAL_CFLAGS := -DCONFIG_LIBNL20
LOCAL_C_INCLUDES := \
- $(LOCAL_PATH) \
- external/libnl-headers
+ $(LOCAL_PATH)
+ifneq ($(wildcard external/libnl),)
+LOCAL_C_INCLUDES += external/libnl/include
+else
+LOCAL_C_INCLUDES += external/libnl-headers
+endif
+
+ifneq ($(wildcard external/libnl),)
+LOCAL_SHARED_LIBRARIES += libnl
+else
LOCAL_STATIC_LIBRARIES := libnl_2
+endif
+
LOCAL_MODULE_TAGS := eng
LOCAL_MODULE := calibrator