diff options
| author | Etan Cohen <etancohen@google.com> | 2017-05-03 09:11:44 -0700 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2017-05-31 11:14:06 -0700 |
| commit | 173acb9dedc177e5e45090c813b9f7cda7e467ce (patch) | |
| tree | 53061d231fb7c46cd298a69917b0855892550eac | |
| parent | 0697df2e29a3255620760667e9192d82102cd85c (diff) | |
| download | android_frameworks_opt_net_wifi-173acb9dedc177e5e45090c813b9f7cda7e467ce.tar.gz android_frameworks_opt_net_wifi-173acb9dedc177e5e45090c813b9f7cda7e467ce.tar.bz2 android_frameworks_opt_net_wifi-173acb9dedc177e5e45090c813b9f7cda7e467ce.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.
(cherry-pick of commit 8faa7c29aa606352db7509ab490e12c3d4c965c5)
Bug: 37901207
Test: builds and runs
Merged-In: I0430c105d613705d88cbe978366e4f3598e953d1
Change-Id: I0430c105d613705d88cbe978366e4f3598e953d1
| -rw-r--r-- | libwifi_hal/Android.mk | 4 |
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 |