commit da8f7afd30ca8bd0572ac0f1610734346cdb9567
author Lorenzo Colitti <lorenzo@google.com> Mon May 04 07:55:26 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 04 07:55:26 2020 +0000
tree 447b994adff5dfc19d76d0f26ebf63955758df03
parent 7a7316aa79744b4b6d4be43f63829c7e6d1a71a7
parent 1d2a753ca45003510611767ab972783cabcf17cf

Merge "Only depend on the latest stable netd AIDL."

services/core/Android.bp

diff --git a/services/core/Android.bp b/services/core/Android.bp
index a2f73a6..d9a5349 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -53,8 +53,8 @@
         "android.hardware.configstore-V1.0-java",
         "android.hardware.contexthub-V1.0-java",
         "android.hidl.manager-V1.2-java",
-        "dnsresolver_aidl_interface-V4-java",
-        "netd_event_listener_interface-java",
+        "dnsresolver_aidl_interface-java",
+        "netd_aidl_interfaces-platform-java",
     ],
 }
 

services/net/Android.bp

diff --git a/services/net/Android.bp b/services/net/Android.bp
index bb5409b..8b444b0 100644
--- a/services/net/Android.bp
+++ b/services/net/Android.bp
@@ -12,8 +12,7 @@
         ":services.net-sources",
     ],
     static_libs: [
-        "dnsresolver_aidl_interface-V4-java",
-        "netd_aidl_interface-V3-java",
+        "netd_aidl_interfaces-platform-java",
         "netlink-client",
         "networkstack-client",
         "net-utils-services-common",
@@ -44,7 +43,8 @@
         "framework-wifi-util-lib",
     ],
     static_libs: [
-        "dnsresolver_aidl_interface-V2-java",
+        // All the classes in netd_aidl_interface must be jarjar so they do not conflict with the
+        // classes generated by netd_aidl_interfaces-platform-java above.
         "netd_aidl_interface-V3-java",
         "netlink-client",
         "networkstack-client",