Merge changes from topic 'system-vendor-internal-pick'
* changes:
libwifi-hal-common: Work with BOARD_VNDK_VERSION
FrameworksWifiTests: Remove system -> vendor dep.
libwifi-hal-(common|fallback): LOCAL_VENDOR_MODULE
diff --git a/libwifi_hal/Android.mk b/libwifi_hal/Android.mk
index a34075d..b06171f 100644
--- a/libwifi_hal/Android.mk
+++ b/libwifi_hal/Android.mk
@@ -64,9 +64,11 @@
# ============================================================
include $(CLEAR_VARS)
LOCAL_MODULE := libwifi-hal-common
+LOCAL_VENDOR_MODULE := true
LOCAL_CFLAGS := $(wifi_hal_cflags)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_SHARED_LIBRARIES := libbase
+LOCAL_HEADER_LIBRARIES := libcutils_headers
LOCAL_SRC_FILES := wifi_hal_common.cpp
include $(BUILD_STATIC_LIBRARY)
@@ -75,6 +77,7 @@
# ============================================================
include $(CLEAR_VARS)
LOCAL_MODULE := libwifi-hal-fallback
+LOCAL_VENDOR_MODULE := true
LOCAL_CFLAGS := $(wifi_hal_cflags)
LOCAL_SRC_FILES := wifi_hal_fallback.cpp
LOCAL_HEADER_LIBRARIES := libhardware_legacy_headers
diff --git a/tests/wifitests/Android.mk b/tests/wifitests/Android.mk
index b285db6..5dbd756 100644
--- a/tests/wifitests/Android.mk
+++ b/tests/wifitests/Android.mk
@@ -100,7 +100,6 @@
libstagefright_foundation \
libstdc++ \
libsync \
- libwifi-hal \
libwifi-system \
libui \
libunwind \
