Make doh_unit_test and doh_ffi_test can be run on the R platfrom am: 5921a87487 (6a5ad4c9) · Commits · e / os / android_packages_modules_DnsResolver

Android.bp

+1 −29

Original line number	Diff line number	Diff line
		@@ -30,10 +30,6 @@ license {
		],
		}

		// Whether to enable the targets in this file that require rust toolchain.
		// Set to false in branches like mainline-prod where rust toolchain isn't supported.
		support_rust_toolchain = true

		cc_library_headers {
		name: "libnetd_resolv_headers",
		export_include_dirs: ["include"],
		@@ -322,7 +318,6 @@ filegroup {

		rust_ffi_static {
		name: "libdoh_ffi",
		enabled: support_rust_toolchain,
		crate_name: "doh",
		srcs: ["doh.rs"],
		edition: "2018",
		@@ -352,31 +347,8 @@ rust_ffi_static {
		min_sdk_version: "29",
		}

		cc_test {
		name: "doh_ffi_test",
		enabled: support_rust_toolchain,
		test_suites: [
		"general-tests",
		],
		defaults: ["netd_defaults"],
		srcs: ["doh_ffi_test.cpp"],
		static_libs: [
		"libdoh_ffi",
		"libgmock",
		"liblog",
		"libring-core",
		],
		// These are not carried over from libdoh_ffi.
		shared_libs: [
		"libcrypto",
		"libssl",
		],
		min_sdk_version: "29",
		}

		rust_test {
		name: "doh_unit_test",
		enabled: support_rust_toolchain,
		crate_name: "doh",
		srcs: ["doh.rs"],
		edition: "2018",
		@@ -391,7 +363,7 @@ rust_test {
		"liblazy_static",
		"liblibc",
		"liblog_rust",
		"libquiche",
		"libquiche_static",
		"libring",
		"libtokio",
		"liburl",

+21 −0

Original line number	Diff line number	Diff line
		@@ -282,3 +282,24 @@ cc_test {
		"stats_proto",
		],
		}

		cc_test {
		name: "doh_ffi_test",
		test_suites: [
		"general-tests",
		],
		defaults: ["netd_defaults"],
		header_libs: [
		"libnetd_resolv_internal_headers",
		],
		srcs: ["doh_ffi_test.cpp"],
		static_libs: [
		"libcrypto_static",
		"libdoh_ffi",
		"libgmock",
		"liblog",
		"libring-core",
		"libssl",
		],
		min_sdk_version: "29",
		}

+0 −0

File moved.