Android: Use external libnl 2.0 dynamic library
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
parent
b7cac41254
commit
ac494fcce4
2 changed files with 16 additions and 0 deletions
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue