Merge "Wifi: fix p2p vts failure on no p2p support devices" (18989412) · Commits · e / os / android_hardware_interfaces

wifi/supplicant/1.0/vts/functional/Android.bp

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,7 @@ cc_library_static {
	defaults: ["VtsHalTargetTestDefaults"],		defaults: ["VtsHalTargetTestDefaults"],
	srcs: ["supplicant_hidl_test_utils.cpp"],		srcs: ["supplicant_hidl_test_utils.cpp"],
	export_include_dirs: [		export_include_dirs: [
	"."		".",
	],		],
	static_libs: [		static_libs: [
	"VtsHalWifiV1_0TargetTestUtil",		"VtsHalWifiV1_0TargetTestUtil",
	@@ -51,14 +51,17 @@ cc_test {
	"libwifi-system",		"libwifi-system",
	"libwifi-system-iface",		"libwifi-system-iface",
	],		],
	test_suites: ["general-tests", "vts-core"],		test_suites: [
			"general-tests",
			"vts-core",
			],
	}		}

	cc_test {		cc_test {
	name: "VtsHalWifiSupplicantP2pV1_0TargetTest",		name: "VtsHalWifiSupplicantP2pV1_0TargetTest",
	defaults: ["VtsHalTargetTestDefaults"],		defaults: ["VtsHalTargetTestDefaults"],
	srcs: [		srcs: [
	"VtsHalWifiSupplicantV1_0TargetTest.cpp",		"VtsHalWifiSupplicantP2pV1_0TargetTest.cpp",
	"supplicant_p2p_iface_hidl_test.cpp",		"supplicant_p2p_iface_hidl_test.cpp",
	],		],
	static_libs: [		static_libs: [
	@@ -71,5 +74,8 @@ cc_test {
	"libwifi-system",		"libwifi-system",
	"libwifi-system-iface",		"libwifi-system-iface",
	],		],
	test_suites: ["general-tests", "vts-core"],		test_suites: [
			"general-tests",
			"vts-core",
			],
	}		}

0 → 100644

+30 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2019 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			#include <VtsCoreUtil.h>
			#include "supplicant_hidl_test_utils.h"

			// TODO(b/143892896): Remove this line after wifi_hidl_test_utils.cpp is
			// updated.
			WifiSupplicantHidlEnvironment* gEnv = nullptr;

			int main(int argc, char** argv) {
			if (!::testing::deviceSupportsFeature("android.hardware.wifi.direct"))
			return 0;

			::testing::InitGoogleTest(&argc, argv);
			return RUN_ALL_TESTS();
			}