aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinit Deshpande <vinitd@google.com>2015-03-12 18:21:10 -0700
committerVinit Deshpande <vinitd@google.com>2015-03-12 18:21:10 -0700
commit3e0babdfb1e14d8b7dd91e6582cc0619a3b002d0 (patch)
treebdacdbfbdc04e3faca6899d306bea23479ae8fd2
parent1952914ecc68a6126bbeac277da6ba1ae1811b3b (diff)
parent210706032dc5e1eedda5db1465f68a804b2a1e11 (diff)
downloadandroid_external_wpa_supplicant_8-3e0babdfb1e14d8b7dd91e6582cc0619a3b002d0.tar.gz
android_external_wpa_supplicant_8-3e0babdfb1e14d8b7dd91e6582cc0619a3b002d0.tar.bz2
android_external_wpa_supplicant_8-3e0babdfb1e14d8b7dd91e6582cc0619a3b002d0.zip
am "Revert "Android: Remove superfluous OpenSSL include paths.""
merged from goog/mirror-m-wireless-internal-release 2107060 Revert "Android: Remove superfluous OpenSSL include paths."
-rw-r--r--hostapd/Android.mk1
-rw-r--r--hs20/client/Android.mk1
-rw-r--r--wpa_supplicant/Android.mk1
3 files changed, 3 insertions, 0 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 123d2c90..6fcefdd1 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -45,6 +45,7 @@ endif
INCLUDES = $(LOCAL_PATH)
INCLUDES += $(LOCAL_PATH)/src
INCLUDES += $(LOCAL_PATH)/src/utils
+INCLUDES += external/openssl/include
INCLUDES += system/security/keystore/include
ifdef CONFIG_DRIVER_NL80211
ifneq ($(wildcard external/libnl),)
diff --git a/hs20/client/Android.mk b/hs20/client/Android.mk
index ced6d8d3..2457e138 100644
--- a/hs20/client/Android.mk
+++ b/hs20/client/Android.mk
@@ -4,6 +4,7 @@ INCLUDES = $(LOCAL_PATH)
INCLUDES += $(LOCAL_PATH)/../../src/utils
INCLUDES += $(LOCAL_PATH)/../../src/common
INCLUDES += $(LOCAL_PATH)/../../src
+INCLUDES += external/openssl/include
INCLUDES += external/libxml2/include
INCLUDES += external/curl/include
INCLUDES += external/webkit/Source/WebKit/gtk
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 2ec99ad3..579582b6 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -61,6 +61,7 @@ INCLUDES += $(LOCAL_PATH)/src/rsn_supp
INCLUDES += $(LOCAL_PATH)/src/tls
INCLUDES += $(LOCAL_PATH)/src/utils
INCLUDES += $(LOCAL_PATH)/src/wps
+INCLUDES += external/openssl/include
INCLUDES += system/security/keystore/include
ifdef CONFIG_DRIVER_NL80211
ifneq ($(wildcard external/libnl),)