commit 1086fc9d033f93ab02e2100ec171fa3de3a6f819
author Kenny Root <kroot@google.com> Wed Jan 28 22:44:40 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 28 22:44:40 2015 +0000
tree 7c9f3b887b6b759389ec4921a142cbdbadd82c49
parent 918cec2c0c1cd4e104babb39af255b2885c39696
parent 6157d599caae4902b6412a78e42e26dae27e5258

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

* commit '6157d599caae4902b6412a78e42e26dae27e5258':
  Android: Remove superfluous OpenSSL include paths.

hostapd/Android.mk

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index edaf6fc..a0e0e5d 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 43c3eed..b5c9660 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -63,7 +63,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),)