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.

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 796a3450cb319a792bdfad9cf2ab44ba5cd6114d..f20861a35c30ee6b44040d52014d508a535e863b 100644 (file)
--- 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 373a344b42b9cd8c76c1296285cda312f9279bc4..56920992ac60ab476454e1e17f84513d2ef455e7 100644 (file)
--- 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)