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