commit c81700d3e94bbf2c84d338661750f1a8f8cfe6cb
author Ben Fennema <fennema@google.com> Mon Aug 29 20:09:16 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 29 20:09:16 2016 +0000
tree b8c8703c09a2eda02a83f0f2a5e1b80c38c0092b
parent b987170762b490360a17eee9c004237bbf2d8028
parent 332a9777fdbb35a674c0b622883d8f4f53c31026

DO NOT MERGE ANYWHERE Fix max number of sched scan SSIDs based on driver capability am: 0fbcc4cde5  -s ours am: 0261db291a  -s ours am: e00d5291c6  -s ours am: 5f5a2ba657  -s ours am: 96bc190e30  -s ours
am: 332a9777fd  -s ours

Change-Id: I594aac4620bcdd8489a2e4e63ec98cc196c3b195

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