Merge "Remove averageTime check in DnsServerSelection test"
diff --git a/Android.bp b/Android.bp
index 00d73c8..18faf03 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,6 +51,19 @@
],
}
+dnsresolver_aidl_interface_lateststable_version = "V7"
+
+cc_library_static {
+ name: "dnsresolver_aidl_interface-lateststable-ndk_platform",
+ whole_static_libs: [
+ "dnsresolver_aidl_interface-" + dnsresolver_aidl_interface_lateststable_version + "-ndk_platform",
+ ],
+ apex_available: [
+ "com.android.resolv",
+ ],
+ min_sdk_version: "29",
+}
+
aidl_interface {
name: "dnsresolver_aidl_interface",
local_include_dir: "binder",
@@ -165,7 +178,7 @@
// 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-lateststable-ndk_platform",
"libbase",
"libcutils",
"libnetdutils",
@@ -173,7 +186,7 @@
"libstatslog_resolv",
"libstatspush_compat",
"libsysutils",
- "netd_event_listener_interface-unstable-ndk_platform",
+ "netd_event_listener_interface-lateststable-ndk_platform",
"server_configurable_flags",
"stats_proto",
],
@@ -306,9 +319,9 @@
"libssl",
],
static_libs: [
- "dnsresolver_aidl_interface-unstable-ndk_platform",
- "netd_aidl_interface-ndk_platform",
- "netd_event_listener_interface-unstable-ndk_platform",
+ "dnsresolver_aidl_interface-lateststable-ndk_platform",
+ "netd_aidl_interface-lateststable-ndk_platform",
+ "netd_event_listener_interface-lateststable-ndk_platform",
"libcutils",
"libgmock",
"libnetd_resolv",
diff --git a/tests/Android.bp b/tests/Android.bp
index 5b90563..060ec19 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -20,7 +20,7 @@
"libutils",
],
static_libs: [
- "netd_aidl_interface-ndk_platform",
+ "netd_aidl_interface-lateststable-ndk_platform",
"libnetd_test_dnsresponder_ndk",
"libnetdutils",
"libgmock",
@@ -102,7 +102,7 @@
"libssl",
],
static_libs: [
- "dnsresolver_aidl_interface-unstable-ndk_platform",
+ "dnsresolver_aidl_interface-lateststable-ndk_platform",
"golddata_proto",
"libgmock",
"libnetd_resolv",
@@ -110,8 +110,8 @@
"libnetd_test_resolv_utils",
"libnetdutils",
"libprotobuf-cpp-lite",
- "netd_aidl_interface-ndk_platform",
- "netd_event_listener_interface-unstable-ndk_platform",
+ "netd_aidl_interface-lateststable-ndk_platform",
+ "netd_event_listener_interface-lateststable-ndk_platform",
"server_configurable_flags",
"stats_proto",
],
@@ -138,14 +138,14 @@
"libnetd_client",
],
static_libs: [
- "dnsresolver_aidl_interface-unstable-ndk_platform",
+ "dnsresolver_aidl_interface-lateststable-ndk_platform",
"libgmock",
"libnetd_test_dnsresponder_ndk",
"libnetd_test_resolv_utils",
"libnetdutils",
"libutils",
- "netd_event_listener_interface-unstable-ndk_platform",
- "netd_aidl_interface-ndk_platform",
+ "netd_event_listener_interface-lateststable-ndk_platform",
+ "netd_aidl_interface-lateststable-ndk_platform",
],
}
@@ -173,7 +173,7 @@
"libnetd_client",
],
static_libs: [
- "dnsresolver_aidl_interface-unstable-ndk_platform",
+ "dnsresolver_aidl_interface-lateststable-ndk_platform",
"libcrypto_static",
"libgmock",
"libnetd_test_dnsresponder_ndk",
@@ -182,8 +182,8 @@
"libnetdutils",
"libssl",
"libutils",
- "netd_aidl_interface-ndk_platform",
- "netd_event_listener_interface-unstable-ndk_platform",
+ "netd_aidl_interface-lateststable-ndk_platform",
+ "netd_event_listener_interface-lateststable-ndk_platform",
"libipchecksum",
"resolv_unsolicited_listener",
],
diff --git a/tests/dns_metrics_listener/Android.bp b/tests/dns_metrics_listener/Android.bp
index a4815b4..7dcd529 100644
--- a/tests/dns_metrics_listener/Android.bp
+++ b/tests/dns_metrics_listener/Android.bp
@@ -20,6 +20,6 @@
],
static_libs: [
"libutils",
- "netd_event_listener_interface-unstable-ndk_platform",
+ "netd_event_listener_interface-lateststable-ndk_platform",
],
}
diff --git a/tests/dns_responder/Android.bp b/tests/dns_responder/Android.bp
index a0b229d..99d4448 100644
--- a/tests/dns_responder/Android.bp
+++ b/tests/dns_responder/Android.bp
@@ -22,12 +22,12 @@
"libnetd_resolv_internal_headers",
],
static_libs: [
- "dnsresolver_aidl_interface-unstable-ndk_platform",
+ "dnsresolver_aidl_interface-lateststable-ndk_platform",
"libcrypto_static",
"libnetdutils",
"libssl",
- "netd_aidl_interface-ndk_platform",
- "netd_event_listener_interface-unstable-ndk_platform",
+ "netd_aidl_interface-lateststable-ndk_platform",
+ "netd_event_listener_interface-lateststable-ndk_platform",
],
srcs: [
"dns_responder.cpp",
diff --git a/tests/dnsresolver_binder_test.cpp b/tests/dnsresolver_binder_test.cpp
index 2000c9f..4e6e5da 100644
--- a/tests/dnsresolver_binder_test.cpp
+++ b/tests/dnsresolver_binder_test.cpp
@@ -123,9 +123,9 @@
// Basic regexp to match dump output lines. Matches the beginning and end of the line, and
// puts the output of the command itself into the first match group.
// Example: " 11-05 00:23:39.481 myCommand(args) <2.02ms>".
- // Note: There are 4 leading blank characters in Q, but 6 in R.
+ // Accept any number of the leading space.
const std::basic_regex lineRegex(
- "^ {4,6}[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}[.][0-9]{3} "
+ "^\\s*[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}[.][0-9]{3} "
"(.*)"
" <[0-9]+[.][0-9]{2}ms>$");
diff --git a/tests/unsolicited_listener/Android.bp b/tests/unsolicited_listener/Android.bp
index 1c81b0b..0c2f4fe 100644
--- a/tests/unsolicited_listener/Android.bp
+++ b/tests/unsolicited_listener/Android.bp
@@ -17,7 +17,7 @@
"libbinder_ndk",
],
static_libs: [
- "dnsresolver_aidl_interface-unstable-ndk_platform",
+ "dnsresolver_aidl_interface-lateststable-ndk_platform",
"libutils",
],
}