From ac494fcce4270dbd076ab1d167dbffd6e0f7060b Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Tue, 18 Feb 2014 16:26:10 -0800 Subject: [PATCH] Android: Use external libnl 2.0 dynamic library Signed-off-by: Dmitry Shmidt --- hostapd/Android.mk | 8 ++++++++ wpa_supplicant/Android.mk | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 6e37beb4d..5d6fe5641 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -51,8 +51,12 @@ INCLUDES += $(LOCAL_PATH)/src/utils INCLUDES += external/openssl/include INCLUDES += system/security/keystore/include ifdef CONFIG_DRIVER_NL80211 +ifneq ($(wildcard external/libnl),) +INCLUDES += external/libnl/include +else INCLUDES += external/libnl-headers endif +endif ifndef CONFIG_OS @@ -910,8 +914,12 @@ LOCAL_STATIC_LIBRARIES += $(BOARD_HOSTAPD_PRIVATE_LIB) endif LOCAL_SHARED_LIBRARIES := libc libcutils liblog libcrypto libssl ifdef CONFIG_DRIVER_NL80211 +ifneq ($(wildcard external/libnl),) +LOCAL_SHARED_LIBRARIES += libnl +else LOCAL_STATIC_LIBRARIES += libnl_2 endif +endif LOCAL_CFLAGS := $(L_CFLAGS) LOCAL_SRC_FILES := $(OBJS) LOCAL_C_INCLUDES := $(INCLUDES) diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 9b0746072..2880b2dad 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -70,8 +70,12 @@ INCLUDES += $(LOCAL_PATH)/src/wps INCLUDES += external/openssl/include INCLUDES += system/security/keystore/include ifdef CONFIG_DRIVER_NL80211 +ifneq ($(wildcard external/libnl),) +INCLUDES += external/libnl/include +else INCLUDES += external/libnl-headers endif +endif ifdef CONFIG_FIPS CONFIG_NO_RANDOM_POOL= @@ -1568,8 +1572,12 @@ ifeq ($(CONFIG_TLS), openssl) LOCAL_SHARED_LIBRARIES += libcrypto libssl libkeystore_binder endif ifdef CONFIG_DRIVER_NL80211 +ifneq ($(wildcard external/libnl),) +LOCAL_SHARED_LIBRARIES += libnl +else LOCAL_STATIC_LIBRARIES += libnl_2 endif +endif LOCAL_CFLAGS := $(L_CFLAGS) LOCAL_SRC_FILES := $(OBJS) LOCAL_C_INCLUDES := $(INCLUDES)