Separate Struct.java into its own lib.

* Struct.java is removed from net-utils-device-common-bpf and
  net-utils-device-common-struct's source list
* Created a lib net-utils-device-common-struct-base for Struct.java
* Updated libs that require Struct.java to include
  net-utils-device-common-struct-base.
* Replaced net-utils-multicast-forwarding-structs with
  net-utils-device-common-struct in service-connectivity

Bug: 323503345

Test: build tethering module.
Change-Id: I3f60715c3d8043b7569db7612dee9d4fa1ccba59
This commit is contained in:
Yang Sun 2024-03-12 21:23:19 +08:00
commit 3aa62e6773
3 changed files with 38 additions and 21 deletions

View file

@ -45,6 +45,9 @@ java_library {
"modules-utils-shell-command-handler",
"net-utils-device-common",
"net-utils-device-common-netlink",
// The required dependency net-utils-device-common-struct-base is in the classpath via
// framework-connectivity
"net-utils-device-common-struct",
"ot-daemon-aidl-java",
],
apex_available: ["com.android.tethering"],

View file

@ -30,6 +30,7 @@ java_defaults {
"net-tests-utils",
"net-utils-device-common",
"net-utils-device-common-bpf",
"net-utils-device-common-struct-base",
"testables",
"ThreadNetworkTestUtils",
"truth",

View file

@ -27,6 +27,7 @@ java_library {
"net-tests-utils",
"net-utils-device-common",
"net-utils-device-common-bpf",
"net-utils-device-common-struct-base",
],
srcs: [
"src/**/*.java",