commit fa4f5aa996c02cfc8d9538b010dc1d5370bf3817
author Remi NGUYEN VAN <reminv@google.com> Mon Jun 22 04:46:10 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 22 04:46:10 2020 +0000
tree 27e594b5f99e123bdb5d725b26628e22e632e904
parent f523ae5bbd9852126eb50d614c162303c042842e
parent 6534f90a6c25938c499a55d30111f90e5ca2ec42

Merge "Use unstable networkstack AIDLs in development branches" into rvc-dev-plus-aosp am: 6534f90a6c

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

Change-Id: I85837943c4dd9e5119a7457cae1a02dc6e0a2c2b

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 9eba6bd..9c8c0aa 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",