From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Wed, 16 Nov 2011 12:57:40 +0000 (+0200)
Subject: Android: Do not use separate private lib
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58dbc037005e700396ba52d8d01a8733a6742dd8;p=thirdparty%2Fhostap.git

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 796a3450c..f20861a35 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 373a344b4..56920992a 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)