diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2014-02-25 20:01:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-25 20:01:23 +0000 |
| commit | d28183c0c33f5ee3876b49ce24cad01f701b6742 (patch) | |
| tree | e24ea22c5423670d6cf0b3b858a82c913c312354 | |
| parent | dd9a784a6d34cdc14c68b03c2402e4fbd5cd7e20 (diff) | |
| parent | af042b19cd7747f736dd4111264682b74da1d094 (diff) | |
| download | wpa_supplicant_8-d28183c0c33f5ee3876b49ce24cad01f701b6742.tar.gz | |
Merge "Android: Use external libnl 2.0 dynamic library"idea133-weekly-release
| -rw-r--r-- | hostapd/Android.mk | 4 | ||||
| -rw-r--r-- | wpa_supplicant/Android.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 695e99c6..4e78c086 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -54,7 +54,7 @@ INCLUDES += $(LOCAL_PATH)/src/utils INCLUDES += external/openssl/include INCLUDES += system/security/keystore/include ifdef CONFIG_DRIVER_NL80211 -INCLUDES += external/libnl-headers +INCLUDES += external/libnl/include endif @@ -913,7 +913,7 @@ LOCAL_STATIC_LIBRARIES += $(BOARD_HOSTAPD_PRIVATE_LIB) endif LOCAL_SHARED_LIBRARIES := libc libcutils liblog libcrypto libssl ifdef CONFIG_DRIVER_NL80211 -LOCAL_STATIC_LIBRARIES += libnl_2 +LOCAL_SHARED_LIBRARIES += libnl endif LOCAL_CFLAGS := $(L_CFLAGS) LOCAL_SRC_FILES := $(OBJS) diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 8515b5a8..bef01b71 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -73,7 +73,7 @@ INCLUDES += $(LOCAL_PATH)/src/wps INCLUDES += external/openssl/include INCLUDES += system/security/keystore ifdef CONFIG_DRIVER_NL80211 -INCLUDES += external/libnl-headers +INCLUDES += external/libnl/include endif ifdef CONFIG_FIPS @@ -1556,7 +1556,7 @@ ifeq ($(CONFIG_TLS), openssl) LOCAL_SHARED_LIBRARIES += libcrypto libssl libkeystore_binder endif ifdef CONFIG_DRIVER_NL80211 -LOCAL_STATIC_LIBRARIES += libnl_2 +LOCAL_SHARED_LIBRARIES += libnl endif LOCAL_CFLAGS := $(L_CFLAGS) LOCAL_SRC_FILES := $(OBJS) |