commit 783a3b82ae2384a944aea9961710bb731bff07aa
author Junyu Lai <junyulai@google.com> Mon Apr 24 17:15:22 2023 +0800
committer Junyu Lai <junyulai@google.com> Tue May 02 11:03:48 2023 +0000
tree 7a6673ba902939e99de452d1657fae89c5119144
parent 747c9b9af56f596a4914b845d399c8b5e770261b

Allow BpfMap to be accessed from NetworkStack

When loading BpfMap class, JNI part is needed for native
methods. Allow the static lib can be compiled with NetworkStack
JNI library.

Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.BpfNetMapsTest
Bug: 276230058
Change-Id: I72ebe801dacd02de6711558d2058c1b756cf3080

staticlibs/native/bpfmapjni/Android.bp

diff --git a/staticlibs/native/bpfmapjni/Android.bp b/staticlibs/native/bpfmapjni/Android.bp
index 8babcce..43d61fc 100644
--- a/staticlibs/native/bpfmapjni/Android.bp
+++ b/staticlibs/native/bpfmapjni/Android.bp
@@ -46,6 +46,7 @@
     ],
     visibility: [
         "//packages/modules/Connectivity:__subpackages__",
+        "//packages/modules/NetworkStack:__subpackages__",
         // TODO: remove after NetworkStatsService moves to the module.
         "//frameworks/base/packages/ConnectivityT/service",
     ],