From 8faa7c29aa606352db7509ab490e12c3d4c965c5 Mon Sep 17 00:00:00 2001
From: Etan Cohen <etancohen@google.com>
Date: Wed, 3 May 2017 09:11:44 -0700
Subject: [WLAN] Change libcld80211 (vendor-specific) library inclusion

The libcld80211 library is vendor-specific - remove from dependency
list. Add as a dependency only for specific vendor.

Bug: 37901207
Test: builds and runs
Change-Id: I0430c105d613705d88cbe978366e4f3598e953d1
---
 libwifi_hal/Android.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libwifi_hal/Android.mk b/libwifi_hal/Android.mk
index b06171f1d..1179a091d 100644
--- a/libwifi_hal/Android.mk
+++ b/libwifi_hal/Android.mk
@@ -86,10 +86,12 @@ include $(BUILD_STATIC_LIBRARY)
 # Pick a vendor provided HAL implementation library.
 # ============================================================
 LIB_WIFI_HAL := libwifi-hal-fallback
+VENDOR_LOCAL_SHARED_LIBRARIES :=
 ifeq ($(BOARD_WLAN_DEVICE), bcmdhd)
   LIB_WIFI_HAL := libwifi-hal-bcm
 else ifeq ($(BOARD_WLAN_DEVICE), qcwcn)
   LIB_WIFI_HAL := libwifi-hal-qcom
+  VENDOR_LOCAL_SHARED_LIBRARIES := libcld80211
 else ifeq ($(BOARD_WLAN_DEVICE), mrvl)
   # this is commented because none of the nexus devices
   # that sport Marvell's wifi have support for HAL
@@ -116,7 +118,7 @@ LOCAL_SHARED_LIBRARIES := \
     liblog \
     libnl \
     libutils \
-    libcld80211
+    $(VENDOR_LOCAL_SHARED_LIBRARIES)
 LOCAL_SRC_FILES := \
     driver_tool.cpp \
     hal_tool.cpp
-- 
cgit v1.2.3