Merge "vts framework-side changes for wifi target-side tests"
diff --git a/Android.mk b/Android.mk
index e44a193..71df970 100644
--- a/Android.mk
+++ b/Android.mk
@@ -126,6 +126,12 @@
 	# @rm -f $@.list
 	# $(hide) unzip $@ -d $(VTS_TESTCASES_OUT)
 	#
+	@echo "build vts python package for WiFi HAL"
+	$(hide) find hardware/interfaces/wifi/1.0/vts/functional -name '*.py' -or -name '*.config' -or -name '*.push' | sort > $@.list
+	$(hide) $(SOONG_ZIP) -d -o $@ -C hardware/interfaces/wifi/1.0/vts/functional -l $@.list
+	@rm -f $@.list
+	$(hide) unzip $@ -d $(VTS_TESTCASES_OUT)
+	#
 	# @echo "build vts python package for tv hdmi_cec HAL"
 	# $(hide) find hardware/interfaces/tv/cec/1.0/vts/functional -name '*.py' -or -name '*.config' -or -name '*.push' | sort > $@.list
 	# $(hide) $(SOONG_ZIP) -d -o $@ -C hardware/interfaces/tv/cec/1.0/vts/functional -l $@.list
diff --git a/tools/build/tasks/list/vts_test_lib_hidl_package_list.mk b/tools/build/tasks/list/vts_test_lib_hidl_package_list.mk
index b9e3646..94d51a8 100644
--- a/tools/build/tasks/list/vts_test_lib_hidl_package_list.mk
+++ b/tools/build/tasks/list/vts_test_lib_hidl_package_list.mk
@@ -64,3 +64,4 @@
   thermal_hidl_hal_test \
   vibrator_hidl_hal_test \
   vr_hidl_hal_test \
+  wifi_hidl_test \