Merge "system/netd TI mac80211: Hostapd updates from omapzoom JB" int…

…o jellybean
grigorig · Aug 17, 2012 · 9fa727e · 9fa727e
2 parents 68f993d + fb3b89f
commit 9fa727e
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 2,243 deletions.
diff --git a/Android.mk b/Android.mk
@@ -41,12 +41,10 @@ LOCAL_CFLAGS := -Werror=format
 LOCAL_SHARED_LIBRARIES := libstlport libsysutils libcutils libnetutils \
                           libcrypto libhardware_legacy libmdnssd
 
-ifdef BOARD_SOFTAP_DEVICE_TI
-    LOCAL_SRC_FILES += SoftapControllerTI.cpp
-    LOCAL_C_INCLUDES += external/libnl-headers
-    LOCAL_STATIC_LIBRARIES += libnl_2
+ifdef USES_TI_MAC80211
+  LOCAL_SRC_FILES += SoftapControllerTI.cpp
 else
-    LOCAL_SRC_FILES += SoftapController.cpp
+  LOCAL_SRC_FILES += SoftapController.cpp
 endif