Snap for 6398428 from c4bd4f3cb7a79d7b688e3e73e0dda90c05b5b827 to rvc-release (1373688d) · Commits · e / os / android_packages_modules_DnsResolver

Android.bp

+7 −1

Original line number	Diff line number	Diff line
		@@ -31,6 +31,9 @@ aidl_interface {
		},
		ndk: {
		gen_log: true,
		apex_available: [
		"com.android.resolv",
		],
		},
		},
		versions: [
		@@ -114,7 +117,7 @@ cc_library {
		// Link most things statically to minimize our dependence on system ABIs.
		stl: "libc++_static",
		static_libs: [
		"dnsresolver_aidl_interface-unstable-ndk_platform",
		"dnsresolver_aidl_interface-ndk_platform",
		"libbase",
		"libcutils",
		"libjsoncpp",
		@@ -163,6 +166,7 @@ cc_library {
		sanitize: {
		cfi: true,
		},
		apex_available: ["com.android.resolv"],
		}

		cc_library_static {
		@@ -175,6 +179,7 @@ cc_library_static {
		srcs: [
		"stats.proto",
		],
		apex_available: ["com.android.resolv"],
		}

		genrule {
		@@ -206,6 +211,7 @@ cc_library_static {
		"libgtest_prod", // Used by libstatspush_compat
		"libstatspush_compat",
		],
		apex_available: ["com.android.resolv"],
		}

		filegroup {

+9 −4

Original line number	Diff line number	Diff line
		// TODO: Remove libnetd_test_dnsresponder after eliminating all users.
		cc_library_static {
		cc_test_library {
		name: "libnetd_test_dnsresponder",
		defaults: ["netd_defaults", "resolv_test_defaults"],
		shared_libs: [
		"dnsresolver_aidl_interface-unstable-cpp",
		"libbinder",
		"libnetd_client",
		],
		static_libs: [
		"dnsresolver_aidl_interface-unstable-cpp",
		"libcrypto_static",
		"libnetdutils",
		"libssl",
		"libutils",
		"netd_aidl_interface-cpp",
		"netd_event_listener_interface-cpp",
		],
		srcs: [
		"dns_responder.cpp",
		@@ -18,7 +23,7 @@ cc_library_static {
		export_include_dirs: ["."],
		}

		cc_library {
		cc_test_library {
		name: "libnetd_test_dnsresponder_ndk",
		defaults: ["netd_defaults", "resolv_test_defaults"],
		shared_libs: [
		@@ -37,8 +42,8 @@ cc_library {
		"libcrypto_static",
		"libnetdutils",
		"libssl",
		"netd_event_listener_interface-ndk_platform",
		"netd_aidl_interface-ndk_platform",
		"netd_event_listener_interface-ndk_platform",
		],
		srcs: [
		"dns_responder.cpp",