Declare/Use lateststable/tot wrapper for aidl_interface

Test: m
Bug: 150578172

Change-Id: If9041a8a5e06afb528cdcc7d6ecd9a65082fc7d1
Merged-In: If9041a8a5e06afb528cdcc7d6ecd9a65082fc7d1

5 files changed, 33 insertions, 20 deletions

diff --git a/Android.bp b/Android.bp
index 00d73c8c..18faf031 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,6 +51,19 @@ cc_library_headers {
     ],
 }
 
+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 @@ 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-lateststable-ndk_platform",
         "libbase",
         "libcutils",
         "libnetdutils",
@@ -173,7 +186,7 @@ cc_library {
         "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 @@ cc_test {
         "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 5b90563b..060ec193 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -20,7 +20,7 @@ cc_test_library {
         "libutils",
     ],
     static_libs: [
-        "netd_aidl_interface-ndk_platform",
+        "netd_aidl_interface-lateststable-ndk_platform",
         "libnetd_test_dnsresponder_ndk",
         "libnetdutils",
         "libgmock",
@@ -102,7 +102,7 @@ cc_test {
         "libssl",
     ],
     static_libs: [
-        "dnsresolver_aidl_interface-unstable-ndk_platform",
+        "dnsresolver_aidl_interface-lateststable-ndk_platform",
         "golddata_proto",
         "libgmock",
         "libnetd_resolv",
@@ -110,8 +110,8 @@ cc_test {
         "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 @@ cc_test {
         "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 @@ cc_test {
         "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 @@ cc_test {
         "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 a4815b48..7dcd529b 100644
--- a/tests/dns_metrics_listener/Android.bp
+++ b/tests/dns_metrics_listener/Android.bp
@@ -20,6 +20,6 @@ cc_test_library {
     ],
     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 a0b229da..99d44489 100644
--- a/tests/dns_responder/Android.bp
+++ b/tests/dns_responder/Android.bp
@@ -22,12 +22,12 @@ cc_test_library {
         "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/unsolicited_listener/Android.bp b/tests/unsolicited_listener/Android.bp
index 1c81b0ba..0c2f4fe2 100644
--- a/tests/unsolicited_listener/Android.bp
+++ b/tests/unsolicited_listener/Android.bp
@@ -17,7 +17,7 @@ cc_test_library {
         "libbinder_ndk",
     ],
     static_libs: [
-        "dnsresolver_aidl_interface-unstable-ndk_platform",
+        "dnsresolver_aidl_interface-lateststable-ndk_platform",
         "libutils",
     ],
 }