commit be96036a63e6b7adc80253d8cb4174c8e56fb0e2
author markchien <markchien@google.com> Sat Jan 22 15:10:26 2022 +0800
committer Maciej Żenczykowski <maze@google.com> Mon Jan 24 19:02:53 2022 +0000
tree 24e56bf27f869e0609a24ebe9ee05bf698b97526
parent 32a6e9cbde86afba574f8b00e27c177a88f6da0c

Decouple "net-utils-framework-common" from "net-utils-device-common-bpf"

Currently "net-utils-device-common-bpf" statically link whole
"net-utils-device-common-struct" which would also pull in
"net-utils-framework-common". Since the classes in
net-utils-framework-common would be loaded into bootclass path, it would
cause sytem server service which located in platform code (the class in
/system/framework/service.jar) not able to use net-utils-device-common-bpf
library.

There is a cts to protect this:
StrictJavaPackagesTest#testBootClasspathAndSystemServerClasspath_nonDuplicateClasses

Bug: 215095957
Test: atest FrameworkNetTests
Change-Id: I232bd21c666dd44f7d0b8cc84610e8cd37dc383c

staticlibs/Android.bp

diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index f1dbbcd..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",
@@ -124,9 +126,6 @@
         "//packages/modules/NetworkStack:__subpackages__",
         "//frameworks/base/services/core",
     ],
-    static_libs: [
-        "net-utils-device-common-struct",
-    ],
     libs: [
         "androidx.annotation_annotation",
     ],