commit 712e08b6fb0ec2b71344436aabc9d0f361a24196
author Dmitry Shmidt <dimitrysh@google.com> Fri Apr 29 20:35:18 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 29 20:35:18 2016 +0000
tree 6965386f9c90c611b6d524154ecad18c06c1a815
parent a25bd013cce925c372fb0a60e5aad9d9be0b248c
parent c7f648c76da42378981249e05ebaf3a767db5a4f

Merge "wpa_supplicant_8: Add a temporary hack to work around BoringSSL incompatibility."

hostapd/Android.mk

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 52d4cfe..a1423ec 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -43,6 +43,10 @@
 L_CFLAGS += -mabi=aapcs-linux
 endif
 
+# TODO(davidben): Remove this once wpa_supplicant is updated to correctly
+# condition SSL_get_client_random, etc., on BoringSSL.
+L_CFLAGS += -DBORINGSSL_SUPPRESS_ACCESSORS
+
 INCLUDES = $(LOCAL_PATH)
 INCLUDES += $(LOCAL_PATH)/src
 INCLUDES += $(LOCAL_PATH)/src/utils

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index e3020ec..38b3ddf 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -49,6 +49,10 @@
 L_CFLAGS += -mabi=aapcs-linux
 endif
 
+# TODO(davidben): Remove this once wpa_supplicant is updated to correctly
+# condition SSL_get_client_random, etc., on BoringSSL.
+L_CFLAGS += -DBORINGSSL_SUPPRESS_ACCESSORS
+
 INCLUDES = $(LOCAL_PATH)
 INCLUDES += $(LOCAL_PATH)/src
 INCLUDES += $(LOCAL_PATH)/src/common