commit 419b298d6f360254c4be75457654ff5449142ef3
author Remi NGUYEN VAN <reminv@google.com> Mon Jun 22 05:06:33 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 22 05:06:33 2020 +0000
tree 0e1cadfa0b6c54802592517177ee0a22006d44ca
parent 8f21023b42ca008af84f88850e4dc56424ae53ed
parent 8a0acb5335920bfc2e397ca7244126b81b05ac92

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

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

Change-Id: I03e05b0c7200ce0daa5e11ba4caa00d19a89f6cc

Tethering/Android.bp

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