commit 9af2c7e7dd010a2789d34af82496aec624ef3e6c
author Jeongik Cha <jeongik@google.com> Tue Oct 15 17:06:40 2019 +0900
committer Jeongik Cha <jeongik@google.com> Tue Oct 29 16:02:34 2019 +0900
tree cc6920f282a556e40ff51fb412512605a4e6435a
parent 4694edc90d497b069619664fcd5cc41fe6a9f1c1

Change AIDL module name

Naming rule for aidl module is changed to make using unstable AIDL module more explicit
So, to use unstable version AIDL module, use "-unstable" suffix version
And also, module name without any suffix means latest frozen version.

But wrt modules for C++ and NDK, module name with latest frozen version
is not available for now.

In b/139280289, more background is explained

Test: m
Bug: 139280289
Change-Id: I13aeac8751e3c9b6791f60f0bf8ea8f5cd44032e
Merged-In: I13aeac8751e3c9b6791f60f0bf8ea8f5cd44032e

Android.bp

diff --git a/Android.bp b/Android.bp
index b646def..a8e2af9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -70,7 +70,7 @@
     // Link most things statically to minimize our dependence on system ABIs.
     stl: "libc++_static",
     static_libs: [
-        "dnsresolver_aidl_interface-ndk_platform",
+        "dnsresolver_aidl_interface-unstable-ndk_platform",
         "libbase",
         "libcutils",
         "libjsoncpp",
@@ -81,7 +81,7 @@
         "libstatssocket",
         "libsysutils",
         "libutils",  // Used by libstatslog_resolv
-        "netd_event_listener_interface-V1-ndk_platform",
+        "netd_event_listener_interface-ndk_platform",
         "server_configurable_flags",
         "stats_proto",
     ],
@@ -175,7 +175,7 @@
         "libutils",
     ],
     static_libs: [
-        "dnsresolver_aidl_interface-cpp",
+        "dnsresolver_aidl_interface-unstable-cpp",
         "libbase",
         "libgmock",
         "libnetd_test_dnsresponder",
@@ -184,8 +184,8 @@
         "libnetd_test_tun_interface",
         "libnetd_test_utils",
         "libnetdutils",
-        "netd_aidl_interface-V2-cpp",
-        "netd_event_listener_interface-V1-cpp",
+        "netd_aidl_interface-cpp",
+        "netd_event_listener_interface-cpp",
     ],
     compile_multilib: "both",
     sanitize: {
@@ -214,9 +214,9 @@
         "libbinder_ndk",
     ],
     static_libs: [
-        "dnsresolver_aidl_interface-V2-cpp",
-        "dnsresolver_aidl_interface-V2-ndk_platform",
-        "netd_event_listener_interface-V1-ndk_platform",
+        "dnsresolver_aidl_interface-cpp",
+        "dnsresolver_aidl_interface-ndk_platform",
+        "netd_event_listener_interface-ndk_platform",
         "libgmock",
         "liblog",
         "libnetd_resolv",

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index f59c371..084b059 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -15,7 +15,7 @@
     static_libs: [
         "libnetd_test_dnsresponder",
         "libnetdutils",
-        "dnsresolver_aidl_interface-V2-cpp",
+        "dnsresolver_aidl_interface-cpp",
     ],
 }
 
@@ -44,9 +44,9 @@
         "libnetd_test_dnsresponder",
         "libnetd_test_resolv_utils",
         "libnetdutils",
-        "netd_aidl_interface-V2-cpp",
+        "netd_aidl_interface-cpp",
         "netd_event_listener_interface-cpp",
-        "dnsresolver_aidl_interface-V2-cpp",
+        "dnsresolver_aidl_interface-cpp",
     ],
     compile_multilib: "both",
     sanitize: {

tests/dns_metrics_listener/Android.bp

diff --git a/tests/dns_metrics_listener/Android.bp b/tests/dns_metrics_listener/Android.bp
index f19ca88..f4c1e26 100644
--- a/tests/dns_metrics_listener/Android.bp
+++ b/tests/dns_metrics_listener/Android.bp
@@ -12,6 +12,6 @@
         "libutils",
     ],
     static_libs: [
-        "netd_event_listener_interface-V1-cpp",
+        "netd_event_listener_interface-cpp",
     ],
 }

tests/dns_responder/Android.bp

diff --git a/tests/dns_responder/Android.bp b/tests/dns_responder/Android.bp
index 0f07088..57f9f58 100644
--- a/tests/dns_responder/Android.bp
+++ b/tests/dns_responder/Android.bp
@@ -2,13 +2,13 @@
     name: "libnetd_test_dnsresponder",
     defaults: ["netd_defaults"],
     shared_libs: [
-        "dnsresolver_aidl_interface-cpp",
+        "dnsresolver_aidl_interface-unstable-cpp",
         "libbase",
         "libbinder",
         "libnetd_client",
         "libnetdutils",
         "libssl",
-        "netd_aidl_interface-V2-cpp",
+        "netd_aidl_interface-cpp",
     ],
     srcs: [
         "dns_responder.cpp",