Keep using the latest stable version

... until the ToT version diverses from the latest stable version.

aosp/1659937 has created the version 6 of netd_aidl_interface. In doing
so, the references to the version V6 (formaly was unstable version) were
switched to the version V7. e.g.

shared_libs: {
- "netd_aidl_interface-V6-cpp",
+ "netd_aidl_interface-V7-cpp",
}

However, this is not only unnecessary (because at this moment V6 == V7
in terms of API signature), but also preventing the API freeze process
because the use an unstable version like V7 is strictly prohibited after
the API is frozen.

The expected development workflow is as follows:

* Now, V10 is the latest stable version. The team hasn't yet started
the development of V11.
* So, there is no reference to V11 at this moment. Every references are
either towards V10 or below.
* The team then starts the development of V11. This happens only in the
development branches like aosp/master, internal/master, but not in
<release>-dev branches.
* Some modules are starting to reference V11 if they need to use the
added APIs.
* V11 is frozen as the new stable version. The story goes on...

Bug: 188713899
Test: m
Change-Id: I13b1dc639723795113e8a6fa6427fccdcbe0c517

2 files changed, 6 insertions, 6 deletions

diff --git a/server/Android.bp b/server/Android.bp
index 6d9b8a0b..9d51d02f 100644
--- a/server/Android.bp
+++ b/server/Android.bp
@@ -224,7 +224,7 @@ cc_library_static {
         "libqtaguid",
         "libssl",
         "libsysutils",
-        "netd_aidl_interface-V7-cpp",
+        "netd_aidl_interface-V6-cpp",
         "netd_event_listener_interface-V1-cpp",
     ],
     aidl: {
@@ -267,7 +267,7 @@ cc_binary {
         "libselinux",
         "libsysutils",
         "libutils",
-        "netd_aidl_interface-V7-cpp",
+        "netd_aidl_interface-V6-cpp",
         "netd_event_listener_interface-V1-cpp",
         "oemnetd_aidl_interface-cpp",
     ],
@@ -318,7 +318,7 @@ cc_binary {
         "libutils",
         "libbinder",
         "dnsresolver_aidl_interface-V7-cpp",
-        "netd_aidl_interface-V7-cpp",
+        "netd_aidl_interface-V6-cpp",
     ],
     srcs: [
         "ndc.cpp",
@@ -365,7 +365,7 @@ cc_test {
         "libnetd_server",
         "libnetd_test_tun_interface",
         "libqtaguid",
-        "netd_aidl_interface-V7-cpp",
+        "netd_aidl_interface-V6-cpp",
         "netd_event_listener_interface-V1-cpp",
     ],
     shared_libs: [
diff --git a/tests/Android.bp b/tests/Android.bp
index c5d9bb53..6ae752b8 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -52,7 +52,7 @@ cc_test_library {
         "libnetutils",
         "libsysutils",
         "libutils",
-        "netd_aidl_interface-V7-cpp",
+        "netd_aidl_interface-V6-cpp",
     ],
 }
 
@@ -107,7 +107,7 @@ cc_test {
         "libnetdbpf",
         "libnetdutils",
         "libqtaguid",
-        "netd_aidl_interface-V7-cpp",
+        "netd_aidl_interface-V6-cpp",
         "netd_event_listener_interface-V1-cpp",
         "oemnetd_aidl_interface-cpp",
     ],