Make resolv_integration_test run on Q devices
use libbinder_ndk for resolv_intergration_test
Also statically link other libs
Bug: 144850003
Test: atest
manual test in Q + M4 resolv module
Change-Id: I1c8a880495afa3764fe6f720e58f46bde18ce872
diff --git a/Android.bp b/Android.bp
index 5e4a50f..24115c6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -152,45 +152,7 @@
],
}
-cc_test {
- name: "resolv_integration_test",
- test_suites: ["device-tests"],
- require_root: true,
- defaults: ["netd_defaults"],
- tidy: false, // cuts test build time by > 1m30s
- srcs: [
- "tests/dns_responder/dns_responder.cpp",
- "dnsresolver_binder_test.cpp",
- "resolv_integration_test.cpp",
- ],
- header_libs: [
- "libnetd_resolv_headers",
- ],
- shared_libs: [
- "libbpf_android",
- "libbinder",
- "libcrypto",
- "liblog",
- "libnetd_client",
- "libssl",
- "libutils",
- ],
- static_libs: [
- "dnsresolver_aidl_interface-unstable-cpp",
- "libbase",
- "libgmock",
- "libnetd_test_dnsresponder",
- "libnetd_test_metrics_listener",
- "libnetd_test_resolv_utils",
- "libnetd_test_tun_interface",
- "libnetd_test_utils",
- "libnetdutils",
- "netd_aidl_interface-cpp",
- "netd_event_listener_interface-cpp",
- ],
- compile_multilib: "both",
-}
-
+// TODO: Move this test to tests/
cc_test {
name: "resolv_unit_test",
test_suites: ["device-tests"],