Move resolv_test_utils into a library (d52f6b12) · Commits · e / os / android_packages_modules_DnsResolver

Android.bp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -157,7 +157,6 @@ cc_test {
	"dns_responder/dns_responder.cpp",		"dns_responder/dns_responder.cpp",
	"dnsresolver_binder_test.cpp",		"dnsresolver_binder_test.cpp",
	"resolver_test.cpp",		"resolver_test.cpp",
	"tests/resolv_test_utils.cpp",
	],		],
	header_libs: [		header_libs: [
	"libnetd_resolv_headers",		"libnetd_resolv_headers",
	@@ -175,6 +174,7 @@ cc_test {
	"libgmock",		"libgmock",
	"libnetd_test_dnsresponder",		"libnetd_test_dnsresponder",
	"libnetd_test_metrics_listener",		"libnetd_test_metrics_listener",
			"libnetd_test_resolv_utils",
	"libnetd_test_tun_interface",		"libnetd_test_tun_interface",
	"libnetd_test_utils",		"libnetd_test_utils",
	"libnetdutils",		"libnetdutils",
	@@ -199,7 +199,6 @@ cc_test {
	"dns_tls_test.cpp",		"dns_tls_test.cpp",
	"libnetd_resolv_test.cpp",		"libnetd_resolv_test.cpp",
	"res_cache_test.cpp",		"res_cache_test.cpp",
	"tests/resolv_test_utils.cpp",
	],		],
	shared_libs: [		shared_libs: [
	"libbase",		"libbase",
	@@ -212,6 +211,7 @@ cc_test {
	"libgmock",		"libgmock",
	"libnetd_resolv",		"libnetd_resolv",
	"libnetd_test_dnsresponder",		"libnetd_test_dnsresponder",
			"libnetd_test_resolv_utils",
	"libnetdutils",		"libnetdutils",
	"libprotobuf-cpp-lite",		"libprotobuf-cpp-lite",
	"server_configurable_flags",		"server_configurable_flags",

+22 −1

Original line number	Original line	Diff line number	Diff line
			cc_test_library {
			name: "libnetd_test_resolv_utils",
			defaults: ["netd_defaults"],
			srcs: [
			"resolv_test_utils.cpp",
			],
			header_libs: [
			"libnetd_resolv_headers",
			"libnetd_resolv_internal_headers",
			],
			shared_libs: [
			"libbase",
			"libutils",
			],
			static_libs: [
			"libnetd_test_dnsresponder",
			"libnetdutils",
			"dnsresolver_aidl_interface-V2-cpp",
			],
			}

	cc_test {		cc_test {
	name: "resolv_stress_test",		name: "resolv_stress_test",
	test_suites: ["device-tests"],		test_suites: ["device-tests"],
	@@ -7,7 +28,6 @@ cc_test {
	defaults: ["netd_defaults"],		defaults: ["netd_defaults"],
	srcs: [		srcs: [
	"resolv_stress_test.cpp",		"resolv_stress_test.cpp",
	"resolv_test_utils.cpp",
	],		],
	header_libs: [		header_libs: [
	"libnetd_resolv_headers",		"libnetd_resolv_headers",
	@@ -22,6 +42,7 @@ cc_test {
	static_libs: [		static_libs: [
	"libgmock",		"libgmock",
	"libnetd_test_dnsresponder",		"libnetd_test_dnsresponder",
			"libnetd_test_resolv_utils",
	"libnetdutils",		"libnetdutils",
	"netd_aidl_interface-V2-cpp",		"netd_aidl_interface-V2-cpp",
	"dnsresolver_aidl_interface-V2-cpp",		"dnsresolver_aidl_interface-V2-cpp",