aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2022-01-31 14:36:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-01-31 14:36:17 +0000
commit3fe7703f2b121becd027aad2f7ae9ff9de940c09 (patch)
tree2b59fb1259502d97222a8e5a7022d765db086585
parent5978d11db4bf8a7c6c90f5048545de51da45a462 (diff)
parent468396bbde7467e43d8d44335f62fbe45181dad2 (diff)
downloadlibnativehelper-3fe7703f2b121becd027aad2f7ae9ff9de940c09.tar.gz
Merge "Allow T mainline connectivity code to link libnativehelper." am: 2ff8890c56 am: 35380a01b0 am: 468396bbde
Original change: https://android-review.googlesource.com/c/platform/libnativehelper/+/1965463 Change-Id: I1365316c016a24e22f505caac05c073e0989a17d
-rw-r--r--Android.bp5
1 files changed, 2 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index ed04cfd..91ac351 100644
--- a/Android.bp
+++ b/Android.bp
@@ -197,13 +197,12 @@ cc_library {
"//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__",