commit d28183c0c33f5ee3876b49ce24cad01f701b6742
author Dmitry Shmidt <dimitrysh@google.com> Tue Feb 25 20:01:22 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 25 20:01:23 2014 +0000
tree e24ea22c5423670d6cf0b3b858a82c913c312354
parent dd9a784a6d34cdc14c68b03c2402e4fbd5cd7e20
parent af042b19cd7747f736dd4111264682b74da1d094

Merge "Android: Use external libnl 2.0 dynamic library"

hostapd/Android.mk

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 695e99c..4e78c08 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -54,7 +54,7 @@
 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 @@
 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)

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 8515b5a..bef01b7 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -73,7 +73,7 @@
 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 @@
 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)