Merge "DnsResolver: make libcrypto a shared lib." (c074661f) · Commits · e / os / android_packages_modules_DnsResolver

Android.bp

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -66,19 +66,16 @@ cc_library {
	"ResolverController.cpp",		"ResolverController.cpp",
	"ResolverEventReporter.cpp",		"ResolverEventReporter.cpp",
	],		],
	// Link everything statically (except for libc) to minimize our dependence		// Link most things statically to minimize our dependence on system ABIs.
	// on system ABIs
	stl: "libc++_static",		stl: "libc++_static",
	static_libs: [		static_libs: [
	"dnsresolver_aidl_interface-ndk_platform",		"dnsresolver_aidl_interface-ndk_platform",
	"libbase",		"libbase",
	"libcrypto",
	"libcutils",		"libcutils",
	"libjsoncpp",		"libjsoncpp",
	"liblog", //Used by libstatslog_resolv		"liblog", //Used by libstatslog_resolv
	"libnetdutils",		"libnetdutils",
	"libprotobuf-cpp-lite",		"libprotobuf-cpp-lite",
	"libssl",
	"libstatslog_resolv",		"libstatslog_resolv",
	"libstatssocket",		"libstatssocket",
	"libsysutils",		"libsysutils",
	@@ -87,8 +84,14 @@ cc_library {
	"server_configurable_flags",		"server_configurable_flags",
	"stats_proto",		"stats_proto",
	],		],
			// libcrypto needs to be used as a shared library because it performs an
			// integrity check (against a checksum) that is not supported for static
			// libs. See http://b/141248879
			// We're also adding libssl here to treat it consistently.
	shared_libs: [		shared_libs: [
	"libbinder_ndk",		"libbinder_ndk",
			"libcrypto",
			"libssl",
	],		],
	header_libs: [		header_libs: [
	"libnetd_client_headers",		"libnetd_client_headers",