commit d09bf3623d741d6e4e5335dbb43a75806aa0ea49
author Jeongik Cha <jeongik@google.com> Sat Feb 20 01:48:45 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 20 01:48:45 2021 +0000
tree 949abbcbebed5c0f79914d8ee139091b6dc50da0
parent 23b4e679340bf8ef329f135a584da65dabb55fe6
parent 16f9a78bf3c25a361f3f43577ea7676c1bb4b4cf

Merge changes from topic "150578172-ns" into sc-dev

* changes:
  [automerge] Specify version for aidl_interface explicitly 2p: 44c15f1ea7
  Specify version for aidl_interface explicitly

Android.bp

diff --git a/Android.bp b/Android.bp
index 597f489..ae1fd89 100644
--- a/Android.bp
+++ b/Android.bp
@@ -88,7 +88,7 @@
     libs: ["unsupportedappusage"],
     static_libs: [
         "androidx.annotation_annotation",
-        "netd_aidl_interface-java",
+        "netd_aidl_interface-lateststable-java",
         "netlink-client",
         "networkstack-client",
         "net-utils-framework-common",

common/networkstackclient/Android.bp

diff --git a/common/networkstackclient/Android.bp b/common/networkstackclient/Android.bp
index e6cbff4..1bcbb34 100644
--- a/common/networkstackclient/Android.bp
+++ b/common/networkstackclient/Android.bp
@@ -152,8 +152,8 @@
         "src/android/net/shared/**/*.java",
     ],
     static_libs: [
-        "ipmemorystore-aidl-interfaces-java",
-        "networkstack-aidl-interfaces-java",
+        "ipmemorystore-aidl-interfaces-V10-java",
+        "networkstack-aidl-interfaces-V10-java",
     ],
     visibility: [
         "//frameworks/base/packages/Tethering",