commit e8fe5a525fa7880e68ec93b6bb9fee475f79e476
author Jeongik Cha <jeongik@google.com> Fri Mar 05 21:18:33 2021 +0900
committer Jeongik Cha <jeongik@google.com> Fri Mar 05 22:42:52 2021 +0900
tree 6229fc43f65a7624c6f9d46dddfb1c3eae60c031
parent 8a6fd56ae786a7ab9206b30ae1384a12e7e2b9ad

Declare/Use lateststable/tot wrapper for aidl_interface

Test: m
Bug: 150578172
Ignore-AOSP-First: aidl version mismatch

Change-Id: If9041a8a5e06afb528cdcc7d6ecd9a65082fc7d1

Android.bp

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",