commit e152e9fe738418a3b80c8f6f29e14cb2a90769e9
author Lorenzo Colitti <lorenzo@google.com> Wed May 22 12:16:50 2019 +0900
committer Remi NGUYEN VAN <reminv@google.com> Wed May 22 18:56:53 2019 +0900
tree b6beaeb21e64da333078485b29de6040b44a8a59
parent 866a03a77d262b6a120e03eba49fa1b2b7d83f17

Properly use versioned interfaces.

Our stable AIDL interfaces need to use versioned build targets,
otherwise getVersion will always return 0, which makes it
impossible to support different components at different versions.

List generated with:
find . -name Android.bp -exec egrep \
    -H "(netd|dnsresolver|ipmemorystore|networkstack).aidl.interface(s?)-(java|cpp)" {} \; \
    | grep -v oemnetd | grep -v tests/

Test: m
Bug: 133124190
Change-Id: I44841034ac5e5d856bce930516aaada0b1cc8293

server/Android.bp

diff --git a/server/Android.bp b/server/Android.bp
index f4a96bc..5129e44 100644
--- a/server/Android.bp
+++ b/server/Android.bp
@@ -102,8 +102,8 @@
         "libpcap",
         "libqtaguid",
         "libssl",
-        "netd_aidl_interface-cpp",
-        "netd_event_listener_interface-cpp",
+        "netd_aidl_interface-V2-cpp",
+        "netd_event_listener_interface-V1-cpp",
     ],
     header_libs: [
         "libnetd_resolv_headers",
@@ -145,8 +145,8 @@
         "libselinux",
         "libsysutils",
         "libutils",
-        "netd_aidl_interface-cpp",
-        "netd_event_listener_interface-cpp",
+        "netd_aidl_interface-V2-cpp",
+        "netd_event_listener_interface-V1-cpp",
         "oemnetd_aidl_interface-cpp",
     ],
     static_libs: [
@@ -195,8 +195,8 @@
         "liblog",
         "libutils",
         "libbinder",
-        "dnsresolver_aidl_interface-cpp",
-        "netd_aidl_interface-cpp",
+        "dnsresolver_aidl_interface-V2-cpp",
+        "netd_aidl_interface-V2-cpp",
     ],
     srcs: [
         "ndc.cpp",
@@ -252,7 +252,7 @@
         "libqtaguid",
         "libsysutils",
         "libutils",
-        "netd_aidl_interface-cpp",
-        "netd_event_listener_interface-cpp",
+        "netd_aidl_interface-V2-cpp",
+        "netd_event_listener_interface-V1-cpp",
     ],
 }