diff options
| author | Etan Cohen <etancohen@google.com> | 2017-05-19 15:52:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-19 15:52:21 +0000 |
| commit | 55e6da7fdc7a144f251ce167e82892f9c752f691 (patch) | |
| tree | 492c1bd316c9960bb38ba7a87e83364dcc01362c | |
| parent | d6fe10a3a95fd658f408c1221334c0f9ee771262 (diff) | |
| parent | c37d92cc16b4d2ac42d6523abd0199e5315638e4 (diff) | |
Merge "[WLAN] Change libcld80211 (vendor-specific) library inclusion"
| -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 |