Merge "Fix resolv tests symbol missing problem for R MTS on Q devices." (355b949d) · Commits · e / os / android_packages_modules_DnsResolver

Android.bp

+13 −3

Original line number	Diff line number	Diff line
		@@ -34,6 +34,18 @@ aidl_interface {
		],
		}

		cc_defaults {
		name: "resolv_test_defaults",
		// Note that, static link liblog and libbase is a hard requirement for resolv related tests
		// because libbase is not compatible between Q and R for general platform build due
		// to its log revelant functions changing. And most of resolv related tests must be able to run
		// in Q.
		static_libs: [
		"libbase",
		"liblog",
		],
		}

		cc_library {
		name: "libnetd_resolv",
		version_script: "libnetd_resolv.map.txt",
		@@ -181,7 +193,7 @@ cc_test {
		test_suites: ["device-tests", "mts"],
		require_root: true,
		//TODO: drop root privileges and make it be an real unit test.
		defaults: ["netd_defaults"],
		defaults: ["netd_defaults", "resolv_test_defaults"],
		srcs: [
		"resolv_cache_unit_test.cpp",
		"resolv_callback_unit_test.cpp",
		@@ -193,14 +205,12 @@ cc_test {
		shared_libs: [
		"libcrypto",
		"libbinder_ndk",
		"liblog",
		"libssl",
		],
		static_libs: [
		"dnsresolver_aidl_interface-unstable-ndk_platform",
		"netd_event_listener_interface-ndk_platform",
		"libcutils",
		"libbase",
		"libgmock",
		"libnetd_resolv",
		"libnetd_test_dnsresponder",

tests/Android.bp

+6 −21

Original line number	Diff line number	Diff line
		cc_test_library {
		name: "libnetd_test_resolv_utils",
		defaults: ["netd_defaults"],
		defaults: ["netd_defaults", "resolv_test_defaults"],
		srcs: [
		"resolv_test_utils.cpp",
		],
		@@ -8,7 +8,6 @@ cc_test_library {
		"libnetd_resolv_headers",
		],
		shared_libs: [
		"libbase",
		"libutils",
		],
		static_libs: [
		@@ -37,7 +36,7 @@ cc_test {
		// can not handle the test with testdata correctly.
		// TODO: Remove the xml after MTS fixing the problem.
		test_config: "resolv_gold_test_config.xml",
		defaults: ["netd_defaults"],
		defaults: ["netd_defaults", "resolv_test_defaults"],
		data: ["testdata/pb/*.pb"],
		srcs: [
		"resolv_gold_test.cpp",
		@@ -48,13 +47,11 @@ cc_test {
		shared_libs: [
		"libcrypto",
		"libbinder_ndk",
		"liblog",
		"libssl",
		],
		static_libs: [
		"dnsresolver_aidl_interface-unstable-ndk_platform",
		"golddata_proto",
		"libbase",
		"libgmock",
		"libnetd_resolv",
		"libnetd_test_dnsresponder_ndk",
		@@ -75,7 +72,7 @@ cc_test {
		// This won't work with test_config
		// require_root: true,
		test_config: "resolv_stress_test_config.xml",
		defaults: ["netd_defaults"],
		defaults: ["netd_defaults", "resolv_test_defaults"],
		srcs: [
		"resolv_stress_test.cpp",
		],
		@@ -84,12 +81,10 @@ cc_test {
		],
		shared_libs: [
		"libbinder_ndk",
		"liblog",
		"libnetd_client",
		],
		static_libs: [
		"dnsresolver_aidl_interface-ndk_platform",
		"libbase",
		"libgmock",
		"libnetd_test_dnsresponder_ndk",
		"libnetd_test_resolv_utils",
		@@ -106,7 +101,7 @@ cc_test {
		test_suites: ["device-tests", "mts"],
		require_root: true,
		test_config: "resolv_integration_test_config.xml",
		defaults: ["netd_defaults"],
		defaults: ["netd_defaults", "resolv_test_defaults"],
		tidy: false, // cuts test build time by > 1m30s
		srcs: [
		"dns_responder/dns_responder.cpp",
		@@ -120,12 +115,10 @@ cc_test {
		//stl: "libc++_static",
		shared_libs: [
		"libbinder_ndk",
		"liblog",
		"libnetd_client",
		],
		static_libs: [
		"dnsresolver_aidl_interface-unstable-ndk_platform",
		"libbase",
		"libbpf_android",
		"libcrypto_static",
		"libgmock",
		@@ -156,13 +149,9 @@ cc_test_library {
		srcs: [
		"resolv_stats_test_utils.cpp"
		],
		defaults: ["netd_defaults"],
		defaults: ["netd_defaults", "resolv_test_defaults"],
		export_include_dirs: ["."],
		shared_libs: [
		"liblog",
		],
		static_libs: [
		"libbase",
		"libgmock",
		"libnetdutils",
		"libprotobuf-cpp-lite",
		@@ -175,13 +164,9 @@ cc_test {
		srcs: [
		"resolv_stats_test_utils_test.cpp",
		],
		defaults: ["netd_defaults"],
		defaults: ["netd_defaults", "resolv_test_defaults"],
		test_suites: ["device-tests"],
		shared_libs: [
		"liblog",
		],
		static_libs: [
		"libbase",
		"libgmock",
		"libprotobuf-cpp-lite",
		"resolv_stats_test_utils",

tests/dns_metrics_listener/Android.bp

+1 −2

Original line number	Diff line number	Diff line
		cc_test_library {
		name: "libnetd_test_metrics_listener",
		defaults: ["netd_defaults"],
		defaults: ["netd_defaults", "resolv_test_defaults"],
		srcs: [
		"base_metrics_listener.cpp",
		"dns_metrics_listener.cpp",
		@@ -10,7 +10,6 @@ cc_test_library {
		"libbinder_ndk",
		],
		static_libs: [
		"libbase",
		"libutils",
		"netd_event_listener_interface-ndk_platform",
		],

tests/dns_responder/Android.bp

+2 −5

Original line number	Diff line number	Diff line
		// TODO: Remove libnetd_test_dnsresponder after eliminating all users.
		cc_library_static {
		name: "libnetd_test_dnsresponder",
		defaults: ["netd_defaults"],
		defaults: ["netd_defaults", "resolv_test_defaults"],
		shared_libs: [
		"dnsresolver_aidl_interface-unstable-cpp",
		"libbase",
		"libbinder",
		"libnetd_client",
		"libnetdutils",
		@@ -21,7 +20,7 @@ cc_library_static {

		cc_library {
		name: "libnetd_test_dnsresponder_ndk",
		defaults: ["netd_defaults"],
		defaults: ["netd_defaults", "resolv_test_defaults"],
		shared_libs: [
		"libbinder_ndk",
		"libnetd_client",
		@@ -35,9 +34,7 @@ cc_library {
		],
		static_libs: [
		"dnsresolver_aidl_interface-unstable-ndk_platform",
		"libbase",
		"libcrypto_static",
		"liblog",
		"libnetdutils",
		"libssl",
		"netd_event_listener_interface-ndk_platform",