commit b7bc68fd7617c52392124dae886e21a69a3820cf
author Maciej Żenczykowski <maze@google.com> Mon Jan 24 19:05:27 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 24 19:05:27 2022 +0000
tree 9295f63e2fcc3a3ee77a2439268fc2c970f590c8
parent 945c8b263846e5523f98fab87429bbac823e9178
parent be96036a63e6b7adc80253d8cb4174c8e56fb0e2

Merge changes from topic "bpfinterfacemap"

* changes:
  Decouple "net-utils-framework-common" from "net-utils-device-common-bpf"
  Add visibility for use bpfmap by BpfInterfaceMapUpdater

staticlibs/Android.bp

diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 16fede8..ba545ea 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -111,8 +111,10 @@
     name: "net-utils-device-common-bpf",
     srcs: [
         "device/com/android/net/module/util/BpfMap.java",
+        "device/com/android/net/module/util/HexDump.java",
         "device/com/android/net/module/util/IBpfMap.java",
         "device/com/android/net/module/util/JniUtil.java",
+        "device/com/android/net/module/util/Struct.java",
         "device/com/android/net/module/util/TcUtils.java",
     ],
     sdk_version: "system_current",
@@ -122,9 +124,7 @@
         "//frameworks/libs/net/common/testutils:__subpackages__",
         "//packages/modules/Connectivity:__subpackages__",
         "//packages/modules/NetworkStack:__subpackages__",
-    ],
-    static_libs: [
-        "net-utils-device-common-struct",
+        "//frameworks/base/services/core",
     ],
     libs: [
         "androidx.annotation_annotation",
@@ -279,6 +279,7 @@
         "framework-connectivity",
     ],
     visibility: [
+        // TODO: remove after NetworkStatsService moves to the module.
         "//frameworks/base/services/net",
         "//packages/modules/Connectivity/tests:__subpackages__",
     ],

staticlibs/native/bpfmapjni/Android.bp

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