DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Android: Use external libnl 2.0 dynamic library

Browse source 
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
Dmitry Shmidt 2014-02-18 16:26:10 -08:00 committed by Jouni Malinen
parent b7cac41254
commit ac494fcce4
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hostapd/Android.mk
View file

@ -51,8 +51,12 @@ INCLUDES += $(LOCAL_PATH)/src/utils
INCLUDES += external/openssl/include INCLUDES += external/openssl/include
INCLUDES += system/security/keystore/include INCLUDES += system/security/keystore/include
ifdef CONFIG_DRIVER_NL80211 ifdef CONFIG_DRIVER_NL80211
ifneq ($(wildcard external/libnl),)
INCLUDES += external/libnl/include
else
INCLUDES += external/libnl-headers INCLUDES += external/libnl-headers
endif endif
endif
ifndef CONFIG_OS ifndef CONFIG_OS
@ -910,8 +914,12 @@ LOCAL_STATIC_LIBRARIES += $(BOARD_HOSTAPD_PRIVATE_LIB)
endif endif
LOCAL_SHARED_LIBRARIES := libc libcutils liblog libcrypto libssl LOCAL_SHARED_LIBRARIES := libc libcutils liblog libcrypto libssl
ifdef CONFIG_DRIVER_NL80211 ifdef CONFIG_DRIVER_NL80211
ifneq ($(wildcard external/libnl),)
LOCAL_SHARED_LIBRARIES += libnl
else
LOCAL_STATIC_LIBRARIES += libnl_2 LOCAL_STATIC_LIBRARIES += libnl_2
endif endif
endif
LOCAL_CFLAGS := $(L_CFLAGS) LOCAL_CFLAGS := $(L_CFLAGS)
LOCAL_SRC_FILES := $(OBJS) LOCAL_SRC_FILES := $(OBJS)
LOCAL_C_INCLUDES := $(INCLUDES) LOCAL_C_INCLUDES := $(INCLUDES)

8
wpa_supplicant/Android.mk
View file

@ -70,8 +70,12 @@ INCLUDES += $(LOCAL_PATH)/src/wps
INCLUDES += external/openssl/include INCLUDES += external/openssl/include
INCLUDES += system/security/keystore/include INCLUDES += system/security/keystore/include
ifdef CONFIG_DRIVER_NL80211 ifdef CONFIG_DRIVER_NL80211
ifneq ($(wildcard external/libnl),)
INCLUDES += external/libnl/include
else
INCLUDES += external/libnl-headers INCLUDES += external/libnl-headers
endif endif
endif
ifdef CONFIG_FIPS ifdef CONFIG_FIPS
CONFIG_NO_RANDOM_POOL= CONFIG_NO_RANDOM_POOL=
@ -1568,8 +1572,12 @@ ifeq ($(CONFIG_TLS), openssl)
LOCAL_SHARED_LIBRARIES += libcrypto libssl libkeystore_binder LOCAL_SHARED_LIBRARIES += libcrypto libssl libkeystore_binder
endif endif
ifdef CONFIG_DRIVER_NL80211 ifdef CONFIG_DRIVER_NL80211
ifneq ($(wildcard external/libnl),)
LOCAL_SHARED_LIBRARIES += libnl
else
LOCAL_STATIC_LIBRARIES += libnl_2 LOCAL_STATIC_LIBRARIES += libnl_2
endif endif
endif
LOCAL_CFLAGS := $(L_CFLAGS) LOCAL_CFLAGS := $(L_CFLAGS)
LOCAL_SRC_FILES := $(OBJS) LOCAL_SRC_FILES := $(OBJS)
LOCAL_C_INCLUDES := $(INCLUDES) LOCAL_C_INCLUDES := $(INCLUDES)