From cc0b57ca061793336a79ae0e3533900bba0cdc7c Mon Sep 17 00:00:00 2001
From: Jeongik Cha <jeongik@google.com>
Date: Tue, 15 Oct 2019 17:03:51 +0900
Subject: 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: Ib38e2cb114cc373ef50652f421ddaff9b4fbe5b9
Merged-In: Ib38e2cb114cc373ef50652f421ddaff9b4fbe5b9
---
 services/net/Android.bp                   | 2 +-
 services/tests/servicestests/Android.bp   | 2 +-
 services/tests/uiservicestests/Android.bp | 2 +-
 tests/net/Android.bp                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/net/Android.bp b/services/net/Android.bp
index 08cdbfc55cfe..2ab8189150de 100644
--- a/services/net/Android.bp
+++ b/services/net/Android.bp
@@ -6,7 +6,7 @@ java_library_static {
     ],
     static_libs: [
         "dnsresolver_aidl_interface-V2-java",
-        "netd_aidl_interface-java",
+        "netd_aidl_interface-unstable-java",
         "networkstack-client",
         "tethering-client",
     ],
diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp
index ecddeb3dda61..eecdeed2cd25 100644
--- a/services/tests/servicestests/Android.bp
+++ b/services/tests/servicestests/Android.bp
@@ -74,7 +74,7 @@ android_test {
         "libui",
         "libunwindstack",
         "libutils",
-        "netd_aidl_interface-V2-cpp",
+        "netd_aidl_interface-cpp",
     ],
 
     dxflags: ["--multi-dex"],
diff --git a/services/tests/uiservicestests/Android.bp b/services/tests/uiservicestests/Android.bp
index 4a9cef1f1cbd..92198fa8cb0c 100644
--- a/services/tests/uiservicestests/Android.bp
+++ b/services/tests/uiservicestests/Android.bp
@@ -55,6 +55,6 @@ android_test {
         "libui",
         "libunwindstack",
         "libutils",
-        "netd_aidl_interface-V2-cpp",
+        "netd_aidl_interface-cpp",
     ],
 }
diff --git a/tests/net/Android.bp b/tests/net/Android.bp
index b9b2238572ac..10f27e243c8c 100644
--- a/tests/net/Android.bp
+++ b/tests/net/Android.bp
@@ -37,7 +37,7 @@ java_defaults {
         "libvndksupport",
         "libziparchive",
         "libz",
-        "netd_aidl_interface-V2-cpp",
+        "netd_aidl_interface-cpp",
     ],
 }
 
-- 
cgit v1.2.3-59-g8ed1b