diff mbox

Android: Remove BoringSSL guard

Message ID f403045cdaa81980210540f8ba7f@google.com
State Accepted
Headers show

Commit Message

Dmitry Shmidt Nov. 10, 2016, 9:05 p.m. UTC
From bc8f103be6b3a87126ad2dd1649d97b8d623daf0 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Wed, 21 Sep 2016 08:27:20 -0700
Subject: [PATCH] Android: Remove BoringSSL guard

BoringSSL is the only supported version of SSL, so remove this guard so
we can continue to compile when the flavor.mk is removed.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
---
  wpa_supplicant/Android.mk | 2 --
  1 file changed, 2 deletions(-)

Comments

Jouni Malinen Nov. 19, 2016, 10:42 p.m. UTC | #1
On Thu, Nov 10, 2016 at 09:05:01PM +0000, dimitrysh@google.com wrote:
> BoringSSL is the only supported version of SSL, so remove this guard so
> we can continue to compile when the flavor.mk is removed.

Thanks, applied.
diff mbox

Patch

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index e2ce407..8d61fda 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1596,9 +1596,7 @@  endif

  # With BoringSSL we need libkeystore-engine in order to provide access to
  # keystore keys.
-ifneq (,$(wildcard external/boringssl/flavor.mk))
  LOCAL_SHARED_LIBRARIES += libkeystore-engine
-endif

  ifdef CONFIG_DRIVER_NL80211
  ifneq ($(wildcard external/libnl),)