diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-04-29 20:35:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-04-29 20:35:18 +0000 |
| commit | 712e08b6fb0ec2b71344436aabc9d0f361a24196 (patch) | |
| tree | 6965386f9c90c611b6d524154ecad18c06c1a815 | |
| parent | a25bd013cce925c372fb0a60e5aad9d9be0b248c (diff) | |
| parent | c7f648c76da42378981249e05ebaf3a767db5a4f (diff) | |
| download | wpa_supplicant_8-nougat-mr1-wear-release.tar.gz | |
Merge "wpa_supplicant_8: Add a temporary hack to work around BoringSSL incompatibility."android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
| -rw-r--r-- | hostapd/Android.mk | 4 | ||||
| -rw-r--r-- | wpa_supplicant/Android.mk | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 52d4cfe0..a1423ec8 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -43,6 +43,10 @@ ifeq ($(TARGET_ARCH),arm) 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 diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index e3020ec9..38b3ddf8 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -49,6 +49,10 @@ ifeq ($(TARGET_ARCH),arm) 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 |