commit f0765910f7cd988e10fd443aababfc27f53167a0
author Kenny Root <kroot@google.com> Thu Jan 29 17:20:50 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 29 17:20:50 2015 +0000
tree b40cb97ad9c3345d91b5dc93fd62db5f616233ca
parent 40b07208ef4402da20a7f666835a62f6ec098e16
parent 1086fc9d033f93ab02e2100ec171fa3de3a6f819

am 1086fc9d: am 6157d599: Merge "Android: Remove superfluous OpenSSL include paths."

* commit '1086fc9d033f93ab02e2100ec171fa3de3a6f819':
  Android: Remove superfluous OpenSSL include paths.

hostapd/Android.mk

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index c8ef46b..df4bb41 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -45,7 +45,6 @@
 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),)

hs20/client/Android.mk

diff --git a/hs20/client/Android.mk b/hs20/client/Android.mk
index 2457e13..ced6d8d 100644
--- a/hs20/client/Android.mk
+++ b/hs20/client/Android.mk
@@ -4,7 +4,6 @@
 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

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 96a969e..ed78bf9 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -61,7 +61,6 @@
 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),)