commit 2ff8890c56ff8bdc6d8da369ea9e1d66b7773bf2
author Lorenzo Colitti <lorenzo@google.com> Mon Jan 31 13:35:30 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 31 13:35:30 2022 +0000
tree 2b59fb1259502d97222a8e5a7022d765db086585
parent 32e84b42674bf0cf485a686fd5e3bab31b99e726
parent f1f74ceb3d404e7d16f1885ab66291e7e032840f

Merge "Allow T mainline connectivity code to link libnativehelper."

Android.bp

diff --git a/Android.bp b/Android.bp
index ed04cfd..91ac351 100644
--- a/Android.bp
+++ b/Android.bp
@@ -197,13 +197,12 @@
         "//cts:__subpackages__",
         "//external/perfetto:__subpackages__",
         "//frameworks/base/packages/Connectivity/tests/integration:__pkg__",
+        "//frameworks/base/packages/ConnectivityT:__subpackages__", // TODO: remove after code move
         "//frameworks/base/packages/Tethering:__subpackages__",
         "//frameworks/libs/net/common/native/bpfmapjni",
         "//frameworks/libs/net/common/native/bpfutiljni",
         "//libcore:__subpackages__",
-        "//packages/modules/Connectivity/service",
-        "//packages/modules/Connectivity/tests:__subpackages__",
-        "//packages/modules/Connectivity/Tethering:__subpackages__",
+        "//packages/modules/Connectivity:__subpackages__",
         "//packages/modules/ExtServices:__subpackages__",
         "//packages/modules/NetworkStack:__subpackages__",
         ":__subpackages__",