1. Add libnetd_updatable.so in com.android.tethering. The library is loaded by netd. Currently, it mainly targets on a few functions which access BPF maps. The functionality may extend in the future. 2. Attach gcroup progs from libnetd_updatable.so. 3. Move (privileged)TagSocket and untagSocket implementation to mainline module. Combine privilegedTagSocket and untagSocket into a single function. 4. Split related unit tests from netd_unit_test to libnetd_updatable_unit_test as well. Bug: 202086915 Test: cd system/netd; atest Test: atest TrafficStatsTest NetworkUsageStatsTest Change-Id: Ib556458103a4cbb643c1342d9b689ac692160de0
120 lines
3.5 KiB
Plaintext
120 lines
3.5 KiB
Plaintext
{
|
|
"presubmit": [
|
|
{
|
|
"name": "ConnectivityCoverageTests"
|
|
},
|
|
// Run in addition to mainline-presubmit as mainline-presubmit is not
|
|
// supported in every branch.
|
|
// CtsNetTestCasesLatestSdk uses stable API shims, so does not exercise
|
|
// some latest APIs. Run CtsNetTestCases to get coverage of newer APIs.
|
|
{
|
|
"name": "CtsNetTestCases",
|
|
"options": [
|
|
{
|
|
"exclude-annotation": "com.android.testutils.SkipPresubmit"
|
|
},
|
|
{
|
|
"exclude-annotation": "androidx.test.filters.RequiresDevice"
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"name": "netd_updatable_unit_test"
|
|
},
|
|
{
|
|
"name": "TetheringTests"
|
|
},
|
|
{
|
|
"name": "TetheringIntegrationTests"
|
|
},
|
|
{
|
|
"name": "traffic_controller_unit_test"
|
|
},
|
|
{
|
|
"name": "libnetworkstats_test"
|
|
}
|
|
],
|
|
"postsubmit": [
|
|
{
|
|
"name": "TetheringPrivilegedTests"
|
|
},
|
|
// TODO: move to presubmit when known green.
|
|
{
|
|
"name": "bpf_existence_test"
|
|
},
|
|
{
|
|
"name": "netd_updatable_unit_test",
|
|
"keywords": ["netd-device-kernel-4.9", "netd-device-kernel-4.14"]
|
|
},
|
|
{
|
|
"name": "libclat_test"
|
|
},
|
|
{
|
|
"name": "traffic_controller_unit_test",
|
|
"keywords": ["netd-device-kernel-4.9", "netd-device-kernel-4.14"]
|
|
},
|
|
{
|
|
"name": "libnetworkstats_test"
|
|
}
|
|
],
|
|
"mainline-presubmit": [
|
|
{
|
|
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
|
|
"options": [
|
|
{
|
|
"exclude-annotation": "com.android.testutils.SkipPresubmit"
|
|
},
|
|
{
|
|
"exclude-annotation": "androidx.test.filters.RequiresDevice"
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"name": "netd_updatable_unit_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
|
|
},
|
|
{
|
|
"name": "ConnectivityCoverageTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
|
|
},
|
|
{
|
|
"name": "traffic_controller_unit_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
|
|
},
|
|
{
|
|
"name": "libnetworkstats_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
|
|
}
|
|
],
|
|
"mainline-postsubmit": [
|
|
// Tests on physical devices with SIM cards: postsubmit only for capacity constraints
|
|
{
|
|
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
|
|
"keywords": ["sim"]
|
|
},
|
|
{
|
|
"name": "TetheringCoverageTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
|
|
},
|
|
// TODO: move to mainline-presubmit when known green.
|
|
{
|
|
"name": "bpf_existence_test[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
|
|
}
|
|
],
|
|
"imports": [
|
|
{
|
|
"path": "frameworks/base/core/java/android/net"
|
|
},
|
|
{
|
|
"path": "frameworks/opt/net/ethernet"
|
|
},
|
|
{
|
|
"path": "packages/modules/NetworkStack"
|
|
},
|
|
{
|
|
"path": "packages/modules/CaptivePortalLogin"
|
|
},
|
|
{
|
|
"path": "packages/modules/Connectivity"
|
|
},
|
|
{
|
|
"path": "packages/modules/Connectivity/Tethering"
|
|
}
|
|
]
|
|
}
|