aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2011-11-16 12:57:40 (GMT)
committerJouni Malinen <j@w1.fi>2013-11-24 20:46:38 (GMT)
commit58dbc037005e700396ba52d8d01a8733a6742dd8 (patch)
tree00db427235ec039ac7075e494c5559a3db071f4a
parented8bfa6274772e7f127693265077f587e04ead65 (diff)
downloadhostap-58dbc037005e700396ba52d8d01a8733a6742dd8.zip
hostap-58dbc037005e700396ba52d8d01a8733a6742dd8.tar.gz
hostap-58dbc037005e700396ba52d8d01a8733a6742dd8.tar.bz2
Android: Do not use separate private lib
The separate private library mechanism used in Android ICS is not very robust when wpa_supplicant/hostapd version changes since the external code is accessing some internal data structures directly. Avoid this type of issues by integrating the private library to be part of wpa_supplicant/hostapd build.
-rw-r--r--hostapd/Android.mk3
-rw-r--r--wpa_supplicant/Android.mk3
2 files changed, 4 insertions, 2 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 796a345..f20861a 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -912,7 +912,8 @@ ifdef CONFIG_DRIVER_CUSTOM
LOCAL_STATIC_LIBRARIES := libCustomWifi
endif
ifneq ($(BOARD_HOSTAPD_PRIVATE_LIB),)
-LOCAL_STATIC_LIBRARIES += $(BOARD_HOSTAPD_PRIVATE_LIB)
+##Build as part of hostapd build now
+##LOCAL_STATIC_LIBRARIES += $(BOARD_HOSTAPD_PRIVATE_LIB)
endif
LOCAL_SHARED_LIBRARIES := libc libcutils liblog libcrypto libssl
ifdef CONFIG_DRIVER_NL80211
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 373a344..5692099 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1556,7 +1556,8 @@ ifdef CONFIG_DRIVER_CUSTOM
LOCAL_STATIC_LIBRARIES := libCustomWifi
endif
ifneq ($(BOARD_WPA_SUPPLICANT_PRIVATE_LIB),)
-LOCAL_STATIC_LIBRARIES += $(BOARD_WPA_SUPPLICANT_PRIVATE_LIB)
+##Build as part of wpa_supplicant build now
+##LOCAL_STATIC_LIBRARIES += $(BOARD_WPA_SUPPLICANT_PRIVATE_LIB)
endif
LOCAL_SHARED_LIBRARIES := libc libcutils liblog
ifeq ($(CONFIG_TLS), openssl)