commit 9fba78c098b8bc5da38fc1b257394dbc594aa13c
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 29 04:16:40 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 29 04:16:40 2020 +0000
tree 723c5c56d21893c30f372ba2ca569bc5e18613df
parent 9228c914d22259cb7fac5e075581cfb79175b19e
parent cdf6b4202c501113699f948c1612c2f4b1f534b9

Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b4202c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444

Change-Id: Ib2a16bd545b98a8d95338f6acce23e265ec5130a

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 4116afc..f89ee24 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -27,7 +27,8 @@
         "androidx.annotation_annotation",
         "netd_aidl_interface-unstable-java",
         "netlink-client",
-        "networkstack-aidl-interfaces-java",
+        // TODO: use networkstack-client instead of just including the AIDL interface
+        "networkstack-aidl-interfaces-unstable-java",
         "android.hardware.tetheroffload.config-V1.0-java",
         "android.hardware.tetheroffload.control-V1.0-java",
         "net-utils-framework-common",