summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2017-05-03 09:11:44 -0700
committerEtan Cohen <etancohen@google.com>2017-05-03 10:57:11 -0700
commit8faa7c29aa606352db7509ab490e12c3d4c965c5 (patch)
treeb7537ed71305e3a30387d673900c542ab994283f
parent74196d24e936be52b75f5b3e3ceecda0fa12bfdd (diff)
downloadandroid_frameworks_opt_net_wifi-8faa7c29aa606352db7509ab490e12c3d4c965c5.tar.gz
android_frameworks_opt_net_wifi-8faa7c29aa606352db7509ab490e12c3d4c965c5.tar.bz2
android_frameworks_opt_net_wifi-8faa7c29aa606352db7509ab490e12c3d4c965c5.zip
[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
-rw-r--r--libwifi_hal/Android.mk4
1 files changed, 3 insertions, 1 deletions
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