commit 4d51d432f5933bc7943d63c970f7b3b42f1917e2
author Dmitry Shmidt <dimitrysh@google.com> Fri Apr 29 20:48:32 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 29 20:48:32 2016 +0000
tree b8c8703c09a2eda02a83f0f2a5e1b80c38c0092b
parent cecd01a69185442dc56b7d86413186b3b779dca9
parent f9b2a3dbfdaabf0ceb42c9905283df45586c93a8

Merge "wpa_supplicant_8: Add a temporary hack to work around BoringSSL incompatibility." am: 712e08b6fb am: 2aa3bdaecf am: e8357569ba
am: f9b2a3dbfd

* commit 'f9b2a3dbfdaabf0ceb42c9905283df45586c93a8':
  wpa_supplicant_8: Add a temporary hack to work around BoringSSL incompatibility.

Change-Id: I097a03e19c2dffab012f3c8c1262533eda33e8f2

hostapd/Android.mk

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 67ca129..c569e4d 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 f65076c..0b85b58 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