tequilaOS/platform_packages_modules_Connectivity
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Separate Struct.java into its own lib." into main

Browse source
This commit is contained in:
Yang Sun 2024-03-28 06:23:57 +00:00 committed by Gerrit Code Review
commit 68d68d82ed
12 changed files with 38 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Tethering/Android.bp
View file

@ -74,6 +74,8 @@ java_defaults {
"net-utils-device-common-bpf",
"net-utils-device-common-ip",
"net-utils-device-common-netlink",
"net-utils-device-common-struct",
"net-utils-device-common-struct-base",
"netd-client",
"tetheringstatsprotos",
],
@ -98,7 +100,6 @@ android_library {
],
static_libs: [
"NetworkStackApiCurrentShims",
"net-utils-device-common-struct",
],
apex_available: ["com.android.tethering"],
lint: {
@ -115,7 +116,6 @@ android_library {
],
static_libs: [
"NetworkStackApiStableShims",
"net-utils-device-common-struct",
],
apex_available: ["com.android.tethering"],
lint: {

1
Tethering/tests/integration/Android.bp
View file

@ -33,6 +33,7 @@ java_defaults {
"net-tests-utils",
"net-utils-device-common",
"net-utils-device-common-bpf",
"net-utils-device-common-struct-base",
"testables",
"connectivity-net-module-utils-bpf",
],

1
Tethering/tests/mts/Android.bp
View file

@ -45,6 +45,7 @@ android_test {
"junit-params",
"connectivity-net-module-utils-bpf",
"net-utils-device-common-bpf",
"net-utils-device-common-struct-base",
],
jni_libs: [

4
common/Android.bp
View file

@ -26,7 +26,7 @@ build = ["FlaggedApi.bp"]
// as the above target may not exist
// depending on the branch
// The library requires the final artifact to contain net-utils-device-common-struct.
// The library requires the final artifact to contain net-utils-device-common-struct-base.
java_library {
name: "connectivity-net-module-utils-bpf",
srcs: [
@ -45,7 +45,7 @@ java_library {
// For libraries which are statically linked in framework-connectivity, do not
// statically link here because callers of this library might already have a static
// version linked.
"net-utils-device-common-struct",
"net-utils-device-common-struct-base",
],
apex_available: [
"com.android.tethering",

2
framework/Android.bp
View file

@ -96,6 +96,7 @@ java_defaults {
],
impl_only_static_libs: [
"net-utils-device-common-bpf",
"net-utils-device-common-struct-base",
],
libs: [
"androidx.annotation_annotation",
@ -124,6 +125,7 @@ java_library {
// Even if the library is included in "impl_only_static_libs" of defaults. This is still
// needed because java_library which doesn't understand "impl_only_static_libs".
"net-utils-device-common-bpf",
"net-utils-device-common-struct-base",
],
libs: [
// This cannot be in the defaults clause above because if it were, it would be used

4
service/Android.bp
View file

@ -199,7 +199,9 @@ java_library {
"PlatformProperties",
"service-connectivity-protos",
"service-connectivity-stats-protos",
"net-utils-multicast-forwarding-structs",
// The required dependency net-utils-device-common-struct-base is in the classpath via
// framework-connectivity
"net-utils-device-common-struct",
],
apex_available: [
"com.android.tethering",

36
staticlibs/Android.bp
View file

@ -124,6 +124,8 @@ filegroup {
],
}
// The net-utils-device-common-bpf library requires the callers to contain
// net-utils-device-common-struct-base.
java_library {
name: "net-utils-device-common-bpf",
srcs: [
@ -133,9 +135,7 @@ java_library {
"device/com/android/net/module/util/BpfUtils.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",
"framework/com/android/net/module/util/HexDump.java",
],
sdk_version: "module_current",
min_sdk_version: "30",
@ -146,6 +146,7 @@ java_library {
libs: [
"androidx.annotation_annotation",
"framework-connectivity.stubs.module_lib",
"net-utils-device-common-struct-base",
],
apex_available: [
"com.android.tethering",
@ -158,12 +159,9 @@ java_library {
}
java_library {
name: "net-utils-device-common-struct",
name: "net-utils-device-common-struct-base",
srcs: [
"device/com/android/net/module/util/Ipv6Utils.java",
"device/com/android/net/module/util/PacketBuilder.java",
"device/com/android/net/module/util/Struct.java",
"device/com/android/net/module/util/structs/*.java",
],
sdk_version: "module_current",
min_sdk_version: "30",
@ -176,6 +174,7 @@ java_library {
],
libs: [
"androidx.annotation_annotation",
"framework-annotations-lib", // Required by InetAddressUtils.java
"framework-connectivity.stubs.module_lib",
],
apex_available: [
@ -188,26 +187,30 @@ java_library {
},
}
// The net-utils-multicast-forwarding-structs library requires the callers to
// contain net-utils-device-common-bpf.
// The net-utils-device-common-struct library requires the callers to contain
// net-utils-device-common-struct-base.
java_library {
name: "net-utils-multicast-forwarding-structs",
name: "net-utils-device-common-struct",
srcs: [
"device/com/android/net/module/util/structs/StructMf6cctl.java",
"device/com/android/net/module/util/structs/StructMif6ctl.java",
"device/com/android/net/module/util/structs/StructMrt6Msg.java",
"device/com/android/net/module/util/Ipv6Utils.java",
"device/com/android/net/module/util/PacketBuilder.java",
"device/com/android/net/module/util/structs/*.java",
],
sdk_version: "module_current",
min_sdk_version: "30",
visibility: [
"//packages/modules/Connectivity:__subpackages__",
"//packages/modules/NetworkStack:__subpackages__",
],
libs: [
// Only Struct.java is needed from "net-utils-device-common-bpf"
"net-utils-device-common-bpf",
"androidx.annotation_annotation",
"framework-annotations-lib", // Required by IpUtils.java
"framework-connectivity.stubs.module_lib",
"net-utils-device-common-struct-base",
],
apex_available: [
"com.android.tethering",
"//apex_available:platform",
],
lint: {
strict_updatability_linting: true,
@ -216,7 +219,7 @@ java_library {
}
// The net-utils-device-common-netlink library requires the callers to contain
// net-utils-device-common-struct.
// net-utils-device-common-struct and net-utils-device-common-struct-base.
java_library {
name: "net-utils-device-common-netlink",
srcs: [
@ -235,6 +238,7 @@ java_library {
// statically link here because callers of this library might already have a static
// version linked.
"net-utils-device-common-struct",
"net-utils-device-common-struct-base",
],
apex_available: [
"com.android.tethering",
@ -247,7 +251,7 @@ java_library {
}
// The net-utils-device-common-ip library requires the callers to contain
// net-utils-device-common-struct.
// net-utils-device-common-struct and net-utils-device-common-struct-base.
java_library {
// TODO : this target should probably be folded into net-utils-device-common
name: "net-utils-device-common-ip",

1
staticlibs/tests/unit/Android.bp
View file

@ -25,6 +25,7 @@ android_library {
"net-utils-device-common-async",
"net-utils-device-common-bpf",
"net-utils-device-common-ip",
"net-utils-device-common-struct-base",
"net-utils-device-common-wear",
],
libs: [

1
staticlibs/testutils/Android.bp
View file

@ -40,6 +40,7 @@ java_library {
"net-utils-device-common-async",
"net-utils-device-common-netlink",
"net-utils-device-common-struct",
"net-utils-device-common-struct-base",
"net-utils-device-common-wear",
"modules-utils-build_system",
],

3
thread/service/Android.bp
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"],

1
thread/tests/integration/Android.bp
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",

1
thread/tests/utils/Android.bp
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",