From 01b5ede2b2f30a5fc2b86b4acabfeec20f3c683e Mon Sep 17 00:00:00 2001 From: Aditya Choudhary Date: Wed, 31 Jan 2024 11:08:57 +0000 Subject: [PATCH] [DON'T BLOCK] Test ownership migration rules This CL is created as a best effort to migrate test targets to the new android ownership model. If you find incorrect or unnecessary attribution in this CL, please create a separate CL to fix that. For more details please refer to the link below, Bug: 304529413 Test: N/A Change-Id: I243f17b3f0ad7af9ffa15ca242456e36688733f5 Merged-In: I243f17b3f0ad7af9ffa15ca242456e36688733f5 --- Cronet/tests/common/Android.bp | 1 + Cronet/tests/cts/Android.bp | 5 +- Cronet/tests/mts/Android.bp | 1 + DnsResolver/Android.bp | 10 +- Tethering/Android.bp | 1 + Tethering/apex/Android.bp | 6 +- Tethering/apex/permissions/Android.bp | 3 +- Tethering/common/TetheringLib/Android.bp | 17 ++-- Tethering/tests/Android.bp | 3 +- Tethering/tests/integration/Android.bp | 7 +- Tethering/tests/mts/Android.bp | 1 + Tethering/tests/privileged/Android.bp | 1 + Tethering/tests/unit/Android.bp | 5 +- bpf_progs/Android.bp | 1 + clatd/Android.bp | 5 +- common/Android.bp | 1 + framework-t/Android.bp | 2 + framework/Android.bp | 1 + nearby/apex/Android.bp | 1 + nearby/framework/Android.bp | 1 + nearby/service/Android.bp | 1 + nearby/service/proto/Android.bp | 3 +- nearby/tests/cts/fastpair/Android.bp | 1 + .../tests/integration/privileged/Android.bp | 1 + nearby/tests/integration/untrusted/Android.bp | 1 + nearby/tests/unit/Android.bp | 1 + netbpfload/Android.bp | 4 + netd/Android.bp | 10 +- remoteauth/framework/Android.bp | 1 + remoteauth/service/Android.bp | 1 + remoteauth/service/jni/Android.bp | 1 + remoteauth/tests/unit/Android.bp | 1 + service-t/Android.bp | 1 + .../native/libs/libnetworkstats/Android.bp | 8 +- service/Android.bp | 1 + .../ServiceConnectivityResources/Android.bp | 1 + service/libconnectivity/Android.bp | 1 + service/native/libs/libclat/Android.bp | 6 +- staticlibs/Android.bp | 99 ++++++++++--------- staticlibs/client-libs/Android.bp | 9 +- staticlibs/client-libs/tests/unit/Android.bp | 3 +- staticlibs/native/bpf_headers/Android.bp | 1 + .../native/bpf_syscall_wrappers/Android.bp | 1 + staticlibs/native/bpfmapjni/Android.bp | 1 + staticlibs/native/bpfutiljni/Android.bp | 1 + staticlibs/native/ip_checksum/Android.bp | 1 + staticlibs/native/netjniutils/Android.bp | 1 + staticlibs/native/nettestutils/Android.bp | 1 + staticlibs/native/tcutils/Android.bp | 1 + staticlibs/netd/Android.bp | 1 + staticlibs/netd/libnetdutils/Android.bp | 6 +- staticlibs/tests/unit/Android.bp | 12 ++- staticlibs/testutils/Android.bp | 15 ++- .../app/connectivitychecker/Android.bp | 5 +- tests/benchmark/Android.bp | 2 +- tests/common/Android.bp | 8 +- tests/cts/hostside/Android.bp | 9 +- tests/cts/hostside/aidl/Android.bp | 1 + tests/cts/hostside/app/Android.bp | 1 + tests/cts/hostside/app2/Android.bp | 1 + tests/cts/hostside/certs/Android.bp | 1 + .../hostside/networkslicingtestapp/Android.bp | 13 +-- tests/cts/net/Android.bp | 3 +- tests/cts/net/api23Test/Android.bp | 1 + tests/cts/net/appForApi23/Android.bp | 1 + tests/cts/net/jni/Android.bp | 1 + tests/cts/net/native/Android.bp | 1 + tests/cts/net/native/dns/Android.bp | 1 + tests/cts/net/util/Android.bp | 6 +- .../internetpermission/Android.bp | 1 + .../updatestatspermission/Android.bp | 1 + tests/cts/tethering/Android.bp | 1 + tests/deflake/Android.bp | 1 + tests/integration/Android.bp | 6 +- tests/mts/Android.bp | 3 +- .../connectivity_native_test/Android.bp | 1 + tests/native/utilities/Android.bp | 3 +- tests/smoketest/Android.bp | 1 + tests/unit/Android.bp | 5 +- tests/unit/jni/Android.bp | 1 + thread/apex/Android.bp | 1 + thread/demoapp/Android.bp | 1 + thread/framework/Android.bp | 1 + thread/service/Android.bp | 1 + thread/tests/cts/Android.bp | 1 + thread/tests/integration/Android.bp | 1 + thread/tests/unit/Android.bp | 1 + tools/Android.bp | 1 + 88 files changed, 243 insertions(+), 114 deletions(-) diff --git a/Cronet/tests/common/Android.bp b/Cronet/tests/common/Android.bp index a484adb0e2..edeb0b3ebc 100644 --- a/Cronet/tests/common/Android.bp +++ b/Cronet/tests/common/Android.bp @@ -17,6 +17,7 @@ // They must be fast and stable, and exercise public or test APIs. package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/Cronet/tests/cts/Android.bp b/Cronet/tests/cts/Android.bp index 7b52694b1a..92b73d954c 100644 --- a/Cronet/tests/cts/Android.bp +++ b/Cronet/tests/cts/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -46,7 +47,9 @@ android_library { "framework-connectivity", "org.apache.http.legacy", ], - lint: { test: true } + lint: { + test: true, + }, } android_test { diff --git a/Cronet/tests/mts/Android.bp b/Cronet/tests/mts/Android.bp index 743a1cabe6..9486e1f0a4 100644 --- a/Cronet/tests/mts/Android.bp +++ b/Cronet/tests/mts/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/DnsResolver/Android.bp b/DnsResolver/Android.bp index d1330343f3..716eb101c5 100644 --- a/DnsResolver/Android.bp +++ b/DnsResolver/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -56,7 +57,10 @@ cc_library { cc_test { name: "dns_helper_unit_test", defaults: ["netd_defaults"], - test_suites: ["general-tests", "mts-tethering"], + test_suites: [ + "general-tests", + "mts-tethering", + ], test_config_template: ":net_native_test_config_template", header_libs: [ "bpf_connectivity_headers", @@ -68,8 +72,8 @@ cc_test { "libcom.android.tethering.dns_helper", ], shared_libs: [ - "libbase", - "libcutils", + "libbase", + "libcutils", ], compile_multilib: "both", multilib: { diff --git a/Tethering/Android.bp b/Tethering/Android.bp index c30e25103d..fba7d69417 100644 --- a/Tethering/Android.bp +++ b/Tethering/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp index de9017ae57..2a77f5739a 100644 --- a/Tethering/apex/Android.bp +++ b/Tethering/apex/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -24,6 +25,7 @@ java_defaults { name: "ConnectivityNextEnableDefaults", enabled: true, } + java_defaults { name: "NetworkStackApiShimSettingsForCurrentBranch", // API shims to include in the networking modules built from the branch. Branches that disable @@ -31,6 +33,7 @@ java_defaults { // (X_current API level). static_libs: ["NetworkStackApiCurrentShims"], } + apex_defaults { name: "ConnectivityApexDefaults", // Tethering app to include in the AOSP apex. Branches that disable the "next" targets may use @@ -38,6 +41,7 @@ apex_defaults { // package names and keys, so that apex will be unused anyway. apps: ["TetheringNext"], // Replace to "Tethering" if ConnectivityNextEnableDefaults is false. } + enable_tethering_next_apex = true // This is a placeholder comment to avoid merge conflicts // as the above target may have different "enabled" values @@ -92,7 +96,7 @@ apex { both: { jni_libs: [ "libframework-connectivity-jni", - "libframework-connectivity-tiramisu-jni" + "libframework-connectivity-tiramisu-jni", ], }, }, diff --git a/Tethering/apex/permissions/Android.bp b/Tethering/apex/permissions/Android.bp index 69c1aa2d4c..20772a8e09 100644 --- a/Tethering/apex/permissions/Android.bp +++ b/Tethering/apex/permissions/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], default_visibility: ["//packages/modules/Connectivity/Tethering:__subpackages__"], } @@ -22,4 +23,4 @@ package { filegroup { name: "privapp_allowlist_com.android.tethering", srcs: ["permissions.xml"], -} \ No newline at end of file +} diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp index bcea425c93..9c2a59dcd7 100644 --- a/Tethering/common/TetheringLib/Android.bp +++ b/Tethering/common/TetheringLib/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -55,14 +56,16 @@ java_sdk_library { hostdex: true, // for hiddenapi check permitted_packages: ["android.net"], - lint: { strict_updatability_linting: true }, + lint: { + strict_updatability_linting: true, + }, } java_library { - name: "framework-tethering-pre-jarjar", - defaults: [ - "framework-tethering-defaults", - ], + name: "framework-tethering-pre-jarjar", + defaults: [ + "framework-tethering-defaults", + ], } java_genrule { @@ -88,7 +91,7 @@ java_defaults { name: "framework-tethering-defaults", defaults: ["framework-module-defaults"], srcs: [ - ":framework-tethering-srcs" + ":framework-tethering-srcs", ], libs: ["framework-connectivity.stubs.module_lib"], aidl: { @@ -107,5 +110,5 @@ filegroup { "src/**/*.aidl", "src/**/*.java", ], - path: "src" + path: "src", } diff --git a/Tethering/tests/Android.bp b/Tethering/tests/Android.bp index 72ca666638..22cf3c5953 100644 --- a/Tethering/tests/Android.bp +++ b/Tethering/tests/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -24,5 +25,5 @@ filegroup { visibility: [ "//packages/modules/Connectivity/tests:__subpackages__", "//packages/modules/Connectivity/Tethering/tests:__subpackages__", - ] + ], } diff --git a/Tethering/tests/integration/Android.bp b/Tethering/tests/integration/Android.bp index 2594a5e13c..f17396d439 100644 --- a/Tethering/tests/integration/Android.bp +++ b/Tethering/tests/integration/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -50,7 +51,7 @@ android_library { visibility: [ "//packages/modules/Connectivity/Tethering/tests/mts", "//packages/modules/Connectivity/tests/cts/net", - ] + ], } // Library including tethering integration tests targeting the latest stable SDK. @@ -67,7 +68,7 @@ android_library { "//packages/modules/Connectivity/tests/cts/tethering", "//packages/modules/Connectivity/tests:__subpackages__", "//packages/modules/Connectivity/Tethering/tests:__subpackages__", - ] + ], } // Library including tethering integration tests targeting current development SDK. @@ -83,7 +84,7 @@ android_library { visibility: [ "//packages/modules/Connectivity/tests/cts/tethering", "//packages/modules/Connectivity/Tethering/tests/mts", - ] + ], } // TODO: remove because TetheringIntegrationTests has been covered by ConnectivityCoverageTests. diff --git a/Tethering/tests/mts/Android.bp b/Tethering/tests/mts/Android.bp index 4f4b03cb1e..a80e49e43d 100644 --- a/Tethering/tests/mts/Android.bp +++ b/Tethering/tests/mts/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/Tethering/tests/privileged/Android.bp b/Tethering/tests/privileged/Android.bp index c890197227..ba6be664c6 100644 --- a/Tethering/tests/privileged/Android.bp +++ b/Tethering/tests/privileged/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/Tethering/tests/unit/Android.bp b/Tethering/tests/unit/Android.bp index 36d9a6362d..24407ca57c 100644 --- a/Tethering/tests/unit/Android.bp +++ b/Tethering/tests/unit/Android.bp @@ -16,6 +16,7 @@ // Tests in this folder are included both in unit tests and CTS. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -23,7 +24,7 @@ java_library { name: "TetheringCommonTests", srcs: [ "common/**/*.java", - "common/**/*.kt" + "common/**/*.kt", ], static_libs: [ "androidx.test.rules", @@ -95,7 +96,7 @@ android_library { visibility: [ "//packages/modules/Connectivity/tests:__subpackages__", "//packages/modules/Connectivity/Tethering/tests:__subpackages__", - ] + ], } android_test { diff --git a/bpf_progs/Android.bp b/bpf_progs/Android.bp index cdf47e7da5..674cd98535 100644 --- a/bpf_progs/Android.bp +++ b/bpf_progs/Android.bp @@ -18,6 +18,7 @@ // struct definitions shared with JNI // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/clatd/Android.bp b/clatd/Android.bp index 595c6b924d..43eb2d8e59 100644 --- a/clatd/Android.bp +++ b/clatd/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["external_android-clat_license"], } @@ -54,7 +55,7 @@ cc_binary { defaults: ["clatd_defaults"], srcs: [ ":clatd_common", - "main.c" + "main.c", ], static_libs: [ "libip_checksum", @@ -101,7 +102,7 @@ cc_test { defaults: ["clatd_defaults"], srcs: [ ":clatd_common", - "clatd_test.cpp" + "clatd_test.cpp", ], static_libs: [ "libbase", diff --git a/common/Android.bp b/common/Android.bp index b9a3b634cb..f4b4caef2a 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/framework-t/Android.bp b/framework-t/Android.bp index b90d99f68f..f485a4472b 100644 --- a/framework-t/Android.bp +++ b/framework-t/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } @@ -34,6 +35,7 @@ java_defaults { name: "enable-framework-connectivity-t-targets", enabled: true, } + // The above defaults can be used to disable framework-connectivity t // targets while minimizing merge conflicts in the build rules. diff --git a/framework/Android.bp b/framework/Android.bp index b7ff04fec1..31ddb5315f 100644 --- a/framework/Android.bp +++ b/framework/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/apex/Android.bp b/nearby/apex/Android.bp index d7f063a662..5fdf5c95ac 100644 --- a/nearby/apex/Android.bp +++ b/nearby/apex/Android.bp @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/framework/Android.bp b/nearby/framework/Android.bp index 4bb9efdb81..0fd9a89372 100644 --- a/nearby/framework/Android.bp +++ b/nearby/framework/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/service/Android.bp b/nearby/service/Android.bp index 17b80b0d84..d34fd837ef 100644 --- a/nearby/service/Android.bp +++ b/nearby/service/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/service/proto/Android.bp b/nearby/service/proto/Android.bp index 1b00cf6784..be5a0b3c60 100644 --- a/nearby/service/proto/Android.bp +++ b/nearby/service/proto/Android.bp @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -41,4 +42,4 @@ java_library { apex_available: [ "com.android.tethering", ], -} \ No newline at end of file +} diff --git a/nearby/tests/cts/fastpair/Android.bp b/nearby/tests/cts/fastpair/Android.bp index 4309d7ed25..aa2806d1b7 100644 --- a/nearby/tests/cts/fastpair/Android.bp +++ b/nearby/tests/cts/fastpair/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/tests/integration/privileged/Android.bp b/nearby/tests/integration/privileged/Android.bp index 9b6e488029..5e6400974a 100644 --- a/nearby/tests/integration/privileged/Android.bp +++ b/nearby/tests/integration/privileged/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/tests/integration/untrusted/Android.bp b/nearby/tests/integration/untrusted/Android.bp index 75f765b67f..e6259c5a26 100644 --- a/nearby/tests/integration/untrusted/Android.bp +++ b/nearby/tests/integration/untrusted/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/nearby/tests/unit/Android.bp b/nearby/tests/unit/Android.bp index bbf42c7c9c..295056832c 100644 --- a/nearby/tests/unit/Android.bp +++ b/nearby/tests/unit/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/netbpfload/Android.bp b/netbpfload/Android.bp index 1f92374b83..037750ee43 100644 --- a/netbpfload/Android.bp +++ b/netbpfload/Android.bp @@ -14,6 +14,10 @@ // limitations under the License. // +package { + default_team: "trendy_team_fwk_core_networking", +} + cc_binary { name: "netbpfload", diff --git a/netd/Android.bp b/netd/Android.bp index 3cdbc9780c..eedbdae504 100644 --- a/netd/Android.bp +++ b/netd/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -58,15 +59,18 @@ cc_library { cc_test { name: "netd_updatable_unit_test", defaults: ["netd_defaults"], - test_suites: ["general-tests", "mts-tethering"], + test_suites: [ + "general-tests", + "mts-tethering", + ], test_config_template: ":net_native_test_config_template", - require_root: true, // required by setrlimitForTest() + require_root: true, // required by setrlimitForTest() header_libs: [ "bpf_connectivity_headers", ], srcs: [ "BpfHandlerTest.cpp", - "BpfBaseTest.cpp" + "BpfBaseTest.cpp", ], static_libs: [ "libbase", diff --git a/remoteauth/framework/Android.bp b/remoteauth/framework/Android.bp index 71b621a3ec..2f1737f346 100644 --- a/remoteauth/framework/Android.bp +++ b/remoteauth/framework/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/remoteauth/service/Android.bp b/remoteauth/service/Android.bp index 8330efc1da..32ae54f5b6 100644 --- a/remoteauth/service/Android.bp +++ b/remoteauth/service/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/remoteauth/service/jni/Android.bp b/remoteauth/service/jni/Android.bp index a95a8fb90d..c0ac7799fc 100644 --- a/remoteauth/service/jni/Android.bp +++ b/remoteauth/service/jni/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/remoteauth/tests/unit/Android.bp b/remoteauth/tests/unit/Android.bp index 77e6f19368..47b9e31c89 100644 --- a/remoteauth/tests/unit/Android.bp +++ b/remoteauth/tests/unit/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/service-t/Android.bp b/service-t/Android.bp index 78c7d35531..19850fd19c 100644 --- a/service-t/Android.bp +++ b/service-t/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/service-t/native/libs/libnetworkstats/Android.bp b/service-t/native/libs/libnetworkstats/Android.bp index b9f3adb91c..c62063404a 100644 --- a/service-t/native/libs/libnetworkstats/Android.bp +++ b/service-t/native/libs/libnetworkstats/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -57,9 +58,12 @@ cc_library { cc_test { name: "libnetworkstats_test", - test_suites: ["general-tests", "mts-tethering"], + test_suites: [ + "general-tests", + "mts-tethering", + ], test_config_template: ":net_native_test_config_template", - require_root: true, // required by setrlimitForTest() + require_root: true, // required by setrlimitForTest() header_libs: ["bpf_connectivity_headers"], srcs: [ "BpfNetworkStatsTest.cpp", diff --git a/service/Android.bp b/service/Android.bp index 0d7e8d0a87..4394f030ba 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/service/ServiceConnectivityResources/Android.bp b/service/ServiceConnectivityResources/Android.bp index 2260596565..2621256f01 100644 --- a/service/ServiceConnectivityResources/Android.bp +++ b/service/ServiceConnectivityResources/Android.bp @@ -16,6 +16,7 @@ // APK to hold all the wifi overlayable resources. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/service/libconnectivity/Android.bp b/service/libconnectivity/Android.bp index e063af7ce6..3a72134e07 100644 --- a/service/libconnectivity/Android.bp +++ b/service/libconnectivity/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/service/native/libs/libclat/Android.bp b/service/native/libs/libclat/Android.bp index 5c6b12395d..6c1c2c4b2d 100644 --- a/service/native/libs/libclat/Android.bp +++ b/service/native/libs/libclat/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -38,7 +39,10 @@ cc_library_static { cc_test { name: "libclat_test", defaults: ["netd_defaults"], - test_suites: ["general-tests", "mts-tethering"], + test_suites: [ + "general-tests", + "mts-tethering", + ], test_config_template: ":net_native_test_config_template", srcs: [ "clatutils_test.cpp", diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp index 8f018c004f..3cbabcce0d 100644 --- a/staticlibs/Android.bp +++ b/staticlibs/Android.bp @@ -28,34 +28,35 @@ // though they are not in the current.txt files. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } java_library { - name: "net-utils-device-common", - srcs: [ - "device/com/android/net/module/util/arp/ArpPacket.java", - "device/com/android/net/module/util/DeviceConfigUtils.java", - "device/com/android/net/module/util/DomainUtils.java", - "device/com/android/net/module/util/FdEventsReader.java", - "device/com/android/net/module/util/NetworkMonitorUtils.java", - "device/com/android/net/module/util/PacketReader.java", - "device/com/android/net/module/util/SharedLog.java", - "device/com/android/net/module/util/SocketUtils.java", - "device/com/android/net/module/util/FeatureVersions.java", - "device/com/android/net/module/util/HandlerUtils.java", - // This library is used by system modules, for which the system health impact of Kotlin - // has not yet been evaluated. Annotations may need jarjar'ing. - // "src_devicecommon/**/*.kt", - ], - sdk_version: "module_current", - min_sdk_version: "30", - target_sdk_version: "30", - apex_available: [ - "//apex_available:anyapex", - "//apex_available:platform", - ], - visibility: [ + name: "net-utils-device-common", + srcs: [ + "device/com/android/net/module/util/arp/ArpPacket.java", + "device/com/android/net/module/util/DeviceConfigUtils.java", + "device/com/android/net/module/util/DomainUtils.java", + "device/com/android/net/module/util/FdEventsReader.java", + "device/com/android/net/module/util/NetworkMonitorUtils.java", + "device/com/android/net/module/util/PacketReader.java", + "device/com/android/net/module/util/SharedLog.java", + "device/com/android/net/module/util/SocketUtils.java", + "device/com/android/net/module/util/FeatureVersions.java", + "device/com/android/net/module/util/HandlerUtils.java", + // This library is used by system modules, for which the system health impact of Kotlin + // has not yet been evaluated. Annotations may need jarjar'ing. + // "src_devicecommon/**/*.kt", + ], + sdk_version: "module_current", + min_sdk_version: "30", + target_sdk_version: "30", + apex_available: [ + "//apex_available:anyapex", + "//apex_available:platform", + ], + visibility: [ "//frameworks/base/packages/Tethering", "//packages/modules/Connectivity:__subpackages__", "//packages/modules/Connectivity/framework:__subpackages__", @@ -65,26 +66,26 @@ java_library { "//frameworks/opt/net/telephony", "//packages/modules/NetworkStack:__subpackages__", "//packages/modules/CaptivePortalLogin", - ], - static_libs: [ - "net-utils-framework-common", - ], - libs: [ - "androidx.annotation_annotation", - "framework-annotations-lib", - "framework-configinfrastructure", - "framework-connectivity.stubs.module_lib", - ], - lint: { - strict_updatability_linting: true, - error_checks: ["NewApi"], - }, + ], + static_libs: [ + "net-utils-framework-common", + ], + libs: [ + "androidx.annotation_annotation", + "framework-annotations-lib", + "framework-configinfrastructure", + "framework-connectivity.stubs.module_lib", + ], + lint: { + strict_updatability_linting: true, + error_checks: ["NewApi"], + }, } java_defaults { name: "lib_mockito_extended", static_libs: [ - "mockito-target-extended-minus-junit4" + "mockito-target-extended-minus-junit4", ], jni_libs: [ "libdexmakerjvmtiagent", @@ -95,12 +96,12 @@ java_defaults { java_library { name: "net-utils-dnspacket-common", srcs: [ - "framework/**/DnsPacket.java", - "framework/**/DnsPacketUtils.java", - "framework/**/DnsSvcbPacket.java", - "framework/**/DnsSvcbRecord.java", - "framework/**/HexDump.java", - "framework/**/NetworkStackConstants.java", + "framework/**/DnsPacket.java", + "framework/**/DnsPacketUtils.java", + "framework/**/DnsSvcbPacket.java", + "framework/**/DnsSvcbRecord.java", + "framework/**/HexDump.java", + "framework/**/NetworkStackConstants.java", ], sdk_version: "module_current", visibility: [ @@ -464,10 +465,10 @@ filegroup { filegroup { name: "net-utils-wifi-service-common-srcs", srcs: [ - "device/android/net/NetworkFactory.java", - "device/android/net/NetworkFactoryImpl.java", - "device/android/net/NetworkFactoryLegacyImpl.java", - "device/android/net/NetworkFactoryShim.java", + "device/android/net/NetworkFactory.java", + "device/android/net/NetworkFactoryImpl.java", + "device/android/net/NetworkFactoryLegacyImpl.java", + "device/android/net/NetworkFactoryShim.java", ], visibility: [ "//frameworks/opt/net/wifi/service", diff --git a/staticlibs/client-libs/Android.bp b/staticlibs/client-libs/Android.bp index c938dd613d..f665584f83 100644 --- a/staticlibs/client-libs/Android.bp +++ b/staticlibs/client-libs/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -10,17 +11,17 @@ java_library { apex_available: [ "//apex_available:platform", "com.android.tethering", - "com.android.wifi" + "com.android.wifi", ], visibility: [ "//packages/modules/Connectivity:__subpackages__", "//frameworks/base/services:__subpackages__", "//frameworks/base/packages:__subpackages__", - "//packages/modules/Wifi/service:__subpackages__" + "//packages/modules/Wifi/service:__subpackages__", ], libs: ["androidx.annotation_annotation"], static_libs: [ "netd_aidl_interface-lateststable-java", - "netd_event_listener_interface-lateststable-java" - ] + "netd_event_listener_interface-lateststable-java", + ], } diff --git a/staticlibs/client-libs/tests/unit/Android.bp b/staticlibs/client-libs/tests/unit/Android.bp index 03e3e70054..7aafd69c58 100644 --- a/staticlibs/client-libs/tests/unit/Android.bp +++ b/staticlibs/client-libs/tests/unit/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -26,7 +27,7 @@ android_library { "//packages/modules/Connectivity/tests:__subpackages__", "//packages/modules/Connectivity/Tethering/tests:__subpackages__", "//packages/modules/NetworkStack/tests/integration", - ] + ], } android_test { diff --git a/staticlibs/native/bpf_headers/Android.bp b/staticlibs/native/bpf_headers/Android.bp index 41184ea48e..d55584ac59 100644 --- a/staticlibs/native/bpf_headers/Android.bp +++ b/staticlibs/native/bpf_headers/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/bpf_syscall_wrappers/Android.bp b/staticlibs/native/bpf_syscall_wrappers/Android.bp index b3efc21668..1e0cb224a5 100644 --- a/staticlibs/native/bpf_syscall_wrappers/Android.bp +++ b/staticlibs/native/bpf_syscall_wrappers/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/bpfmapjni/Android.bp b/staticlibs/native/bpfmapjni/Android.bp index 8babcce3f7..7e6b4ec452 100644 --- a/staticlibs/native/bpfmapjni/Android.bp +++ b/staticlibs/native/bpfmapjni/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/bpfutiljni/Android.bp b/staticlibs/native/bpfutiljni/Android.bp index 39a2795086..1ef01a67de 100644 --- a/staticlibs/native/bpfutiljni/Android.bp +++ b/staticlibs/native/bpfutiljni/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/ip_checksum/Android.bp b/staticlibs/native/ip_checksum/Android.bp index 9878d73771..e2e118e822 100644 --- a/staticlibs/native/ip_checksum/Android.bp +++ b/staticlibs/native/ip_checksum/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/netjniutils/Android.bp b/staticlibs/native/netjniutils/Android.bp index ca3bbbc0a1..4cab45907b 100644 --- a/staticlibs/native/netjniutils/Android.bp +++ b/staticlibs/native/netjniutils/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/nettestutils/Android.bp b/staticlibs/native/nettestutils/Android.bp index df3bb4288c..ef87f04ca7 100644 --- a/staticlibs/native/nettestutils/Android.bp +++ b/staticlibs/native/nettestutils/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/native/tcutils/Android.bp b/staticlibs/native/tcutils/Android.bp index 9a38745c69..926590d24a 100644 --- a/staticlibs/native/tcutils/Android.bp +++ b/staticlibs/native/tcutils/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/netd/Android.bp b/staticlibs/netd/Android.bp index 2b7e620705..59ef20d34a 100644 --- a/staticlibs/netd/Android.bp +++ b/staticlibs/netd/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/staticlibs/netd/libnetdutils/Android.bp b/staticlibs/netd/libnetdutils/Android.bp index fdb9380d4f..2ae5911ecf 100644 --- a/staticlibs/netd/libnetdutils/Android.bp +++ b/staticlibs/netd/libnetdutils/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -22,7 +23,10 @@ cc_library { "Utils.cpp", ], defaults: ["netd_defaults"], - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], shared_libs: [ "libbase", "liblog", diff --git a/staticlibs/tests/unit/Android.bp b/staticlibs/tests/unit/Android.bp index 0dfca57f44..d203bc0a0b 100644 --- a/staticlibs/tests/unit/Android.bp +++ b/staticlibs/tests/unit/Android.bp @@ -3,12 +3,16 @@ //######################################################################## package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } android_library { name: "NetworkStaticLibTestsLib", - srcs: ["src/**/*.java","src/**/*.kt"], + srcs: [ + "src/**/*.java", + "src/**/*.kt", + ], min_sdk_version: "30", defaults: ["framework-connectivity-test-defaults"], static_libs: [ @@ -35,7 +39,7 @@ android_library { ], lint: { strict_updatability_linting: true, - test: true + test: true, }, } @@ -52,5 +56,7 @@ android_test { ], jarjar_rules: "jarjar-rules.txt", test_suites: ["device-tests"], - lint: { strict_updatability_linting: true }, + lint: { + strict_updatability_linting: true, + }, } diff --git a/staticlibs/testutils/Android.bp b/staticlibs/testutils/Android.bp index 43853ee463..a8e5a69e02 100644 --- a/staticlibs/testutils/Android.bp +++ b/staticlibs/testutils/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -24,11 +25,11 @@ java_library { ], defaults: [ "framework-connectivity-test-defaults", - "lib_mockito_extended" + "lib_mockito_extended", ], libs: [ "androidx.annotation_annotation", - "net-utils-device-common-bpf", // TestBpfMap extends IBpfMap. + "net-utils-device-common-bpf", // TestBpfMap extends IBpfMap. ], static_libs: [ "androidx.test.ext.junit", @@ -42,7 +43,9 @@ java_library { "net-utils-device-common-wear", "modules-utils-build_system", ], - lint: { strict_updatability_linting: true }, + lint: { + strict_updatability_linting: true, + }, } java_library { @@ -72,9 +75,11 @@ java_library { "jsr305", ], static_libs: [ - "kotlin-test" + "kotlin-test", ], - lint: { strict_updatability_linting: true }, + lint: { + strict_updatability_linting: true, + }, } java_test_host { diff --git a/staticlibs/testutils/app/connectivitychecker/Android.bp b/staticlibs/testutils/app/connectivitychecker/Android.bp index 049ec9e1b7..5af8c147f9 100644 --- a/staticlibs/testutils/app/connectivitychecker/Android.bp +++ b/staticlibs/testutils/app/connectivitychecker/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -30,5 +31,7 @@ android_test_helper_app { "net-tests-utils", ], host_required: ["net-tests-utils-host-common"], - lint: { strict_updatability_linting: true }, + lint: { + strict_updatability_linting: true, + }, } diff --git a/tests/benchmark/Android.bp b/tests/benchmark/Android.bp index 6ea53473b5..7854bb51e1 100644 --- a/tests/benchmark/Android.bp +++ b/tests/benchmark/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } @@ -40,4 +41,3 @@ android_test { test_suites: ["device-tests"], jarjar_rules: ":connectivity-jarjar-rules", } - diff --git a/tests/common/Android.bp b/tests/common/Android.bp index 7b5c298b5c..6e9d614381 100644 --- a/tests/common/Android.bp +++ b/tests/common/Android.bp @@ -17,6 +17,7 @@ // Tests in this folder are included both in unit tests and CTS. // They must be fast and stable, and exercise public or test APIs. package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } @@ -93,7 +94,10 @@ android_test { name: "ConnectivityCoverageTests", // Tethering started on SDK 30 min_sdk_version: "30", - test_suites: ["general-tests", "mts-tethering"], + test_suites: [ + "general-tests", + "mts-tethering", + ], defaults: [ "ConnectivityTestsLatestSdkDefaults", "framework-connectivity-internal-test-defaults", @@ -185,7 +189,7 @@ java_defaults { // See SuiteModuleLoader.java. // TODO: why are the modules separated by + instead of being separate entries in the array? mainline_presubmit_modules = [ - "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex", + "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex", ] cc_defaults { diff --git a/tests/cts/hostside/Android.bp b/tests/cts/hostside/Android.bp index a0aafc642a..2688fb8ff9 100644 --- a/tests/cts/hostside/Android.bp +++ b/tests/cts/hostside/Android.bp @@ -12,17 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -next_app_data = [ ":CtsHostsideNetworkTestsAppNext" ] +next_app_data = [":CtsHostsideNetworkTestsAppNext"] // The above line is put in place to prevent any future automerger merge conflict between aosp, // downstream branches. The CtsHostsideNetworkTestsAppNext target will not exist in // some downstream branches, but it should exist in aosp and some downstream branches. - - - - package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -45,7 +42,7 @@ java_test_host { "general-tests", "mcts-tethering", "mts-tethering", - "sts" + "sts", ], data: [ ":CtsHostsideNetworkTestsApp", diff --git a/tests/cts/hostside/aidl/Android.bp b/tests/cts/hostside/aidl/Android.bp index 2751f6ff82..18a5897816 100644 --- a/tests/cts/hostside/aidl/Android.bp +++ b/tests/cts/hostside/aidl/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/hostside/app/Android.bp b/tests/cts/hostside/app/Android.bp index 470bb17a02..d5554915b1 100644 --- a/tests/cts/hostside/app/Android.bp +++ b/tests/cts/hostside/app/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/hostside/app2/Android.bp b/tests/cts/hostside/app2/Android.bp index db92f5c15a..c52617236d 100644 --- a/tests/cts/hostside/app2/Android.bp +++ b/tests/cts/hostside/app2/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/hostside/certs/Android.bp b/tests/cts/hostside/certs/Android.bp index 60b54769ea..301973ea20 100644 --- a/tests/cts/hostside/certs/Android.bp +++ b/tests/cts/hostside/certs/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/hostside/networkslicingtestapp/Android.bp b/tests/cts/hostside/networkslicingtestapp/Android.bp index 2aa3f6983f..100b6e4872 100644 --- a/tests/cts/hostside/networkslicingtestapp/Android.bp +++ b/tests/cts/hostside/networkslicingtestapp/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -39,8 +40,8 @@ java_defaults { android_test_helper_app { name: "CtsHostsideNetworkCapTestsAppWithoutProperty", defaults: [ - "cts_support_defaults", - "CtsHostsideNetworkCapTestsAppDefaults" + "cts_support_defaults", + "CtsHostsideNetworkCapTestsAppDefaults", ], manifest: "AndroidManifestWithoutProperty.xml", } @@ -48,8 +49,8 @@ android_test_helper_app { android_test_helper_app { name: "CtsHostsideNetworkCapTestsAppWithProperty", defaults: [ - "cts_support_defaults", - "CtsHostsideNetworkCapTestsAppDefaults" + "cts_support_defaults", + "CtsHostsideNetworkCapTestsAppDefaults", ], manifest: "AndroidManifestWithProperty.xml", } @@ -57,8 +58,8 @@ android_test_helper_app { android_test_helper_app { name: "CtsHostsideNetworkCapTestsAppSdk33", defaults: [ - "cts_support_defaults", - "CtsHostsideNetworkCapTestsAppDefaults" + "cts_support_defaults", + "CtsHostsideNetworkCapTestsAppDefaults", ], target_sdk_version: "33", manifest: "AndroidManifestWithoutProperty.xml", diff --git a/tests/cts/net/Android.bp b/tests/cts/net/Android.bp index f0e0ae87b4..98d56306ca 100644 --- a/tests/cts/net/Android.bp +++ b/tests/cts/net/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -69,7 +70,7 @@ java_defaults { data: [ ":ConnectivityTestPreparer", ":CtsCarrierServicePackage", - ] + ], } // Networking CTS tests for development and release. These tests always target the platform SDK diff --git a/tests/cts/net/api23Test/Android.bp b/tests/cts/net/api23Test/Android.bp index 1f1dd5db64..2ec3a707dc 100644 --- a/tests/cts/net/api23Test/Android.bp +++ b/tests/cts/net/api23Test/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/net/appForApi23/Android.bp b/tests/cts/net/appForApi23/Android.bp index b39690f14f..d3007438ab 100644 --- a/tests/cts/net/appForApi23/Android.bp +++ b/tests/cts/net/appForApi23/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/net/jni/Android.bp b/tests/cts/net/jni/Android.bp index a4213496e7..fbf4f29df5 100644 --- a/tests/cts/net/jni/Android.bp +++ b/tests/cts/net/jni/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/net/native/Android.bp b/tests/cts/net/native/Android.bp index 153ff51964..3f2459278c 100644 --- a/tests/cts/net/native/Android.bp +++ b/tests/cts/net/native/Android.bp @@ -15,6 +15,7 @@ // Build the unit tests. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/net/native/dns/Android.bp b/tests/cts/net/native/dns/Android.bp index a9e3715368..8e24fba686 100644 --- a/tests/cts/net/native/dns/Android.bp +++ b/tests/cts/net/native/dns/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/net/util/Android.bp b/tests/cts/net/util/Android.bp index fffd30f7e1..644634b9e1 100644 --- a/tests/cts/net/util/Android.bp +++ b/tests/cts/net/util/Android.bp @@ -16,12 +16,16 @@ // Common utilities for cts net tests. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } java_library { name: "cts-net-utils", - srcs: ["java/**/*.java", "java/**/*.kt"], + srcs: [ + "java/**/*.java", + "java/**/*.kt", + ], static_libs: [ "compatibility-device-util-axt", "junit", diff --git a/tests/cts/netpermission/internetpermission/Android.bp b/tests/cts/netpermission/internetpermission/Android.bp index 53143965db..7d5ca2f14c 100644 --- a/tests/cts/netpermission/internetpermission/Android.bp +++ b/tests/cts/netpermission/internetpermission/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/netpermission/updatestatspermission/Android.bp b/tests/cts/netpermission/updatestatspermission/Android.bp index 40474db3a0..2fde1ce992 100644 --- a/tests/cts/netpermission/updatestatspermission/Android.bp +++ b/tests/cts/netpermission/updatestatspermission/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/tethering/Android.bp b/tests/cts/tethering/Android.bp index 4284f56a91..392896167f 100644 --- a/tests/cts/tethering/Android.bp +++ b/tests/cts/tethering/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/deflake/Android.bp b/tests/deflake/Android.bp index 8205f1cf2f..726e504341 100644 --- a/tests/deflake/Android.bp +++ b/tests/deflake/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp index f705e34571..349529ddb0 100644 --- a/tests/integration/Android.bp +++ b/tests/integration/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } @@ -74,7 +75,10 @@ android_test { java_library { name: "frameworks-net-integration-testutils", defaults: ["framework-connectivity-test-defaults"], - srcs: ["util/**/*.java", "util/**/*.kt"], + srcs: [ + "util/**/*.java", + "util/**/*.kt", + ], static_libs: [ "androidx.annotation_annotation", "androidx.test.rules", diff --git a/tests/mts/Android.bp b/tests/mts/Android.bp index 64252235ce..336be2e081 100644 --- a/tests/mts/Android.bp +++ b/tests/mts/Android.bp @@ -14,6 +14,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -38,5 +39,5 @@ cc_test { "bpf_existence_test.cpp", ], compile_multilib: "first", - min_sdk_version: "30", // Ensure test runs on R and above. + min_sdk_version: "30", // Ensure test runs on R and above. } diff --git a/tests/native/connectivity_native_test/Android.bp b/tests/native/connectivity_native_test/Android.bp index 8825aa41e6..2f66d17c54 100644 --- a/tests/native/connectivity_native_test/Android.bp +++ b/tests/native/connectivity_native_test/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/native/utilities/Android.bp b/tests/native/utilities/Android.bp index 4706b3d869..2f761d7f85 100644 --- a/tests/native/utilities/Android.bp +++ b/tests/native/utilities/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_core_networking", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -21,7 +22,7 @@ cc_test_library { name: "libconnectivity_native_test_utils", defaults: [ "netd_defaults", - "resolv_test_defaults" + "resolv_test_defaults", ], srcs: [ "firewall.cpp", diff --git a/tests/smoketest/Android.bp b/tests/smoketest/Android.bp index 4ab24fcb0a..121efa1a38 100644 --- a/tests/smoketest/Android.bp +++ b/tests/smoketest/Android.bp @@ -10,6 +10,7 @@ // TODO: remove this hack when there is a better solution for jni_libs that includes // dependent libraries. package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp index 8b286a07b3..4a1298f86f 100644 --- a/tests/unit/Android.bp +++ b/tests/unit/Android.bp @@ -2,6 +2,7 @@ // Build FrameworksNetTests package //######################################################################## package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "Android-Apache-2.0" @@ -73,7 +74,7 @@ filegroup { "java/com/android/server/connectivity/NetdEventListenerServiceTest.java", "java/com/android/server/connectivity/VpnTest.java", "java/com/android/server/net/ipmemorystore/*.java", - ] + ], } // Subset of services-core used to by ConnectivityService tests to test VPN realistically. @@ -115,7 +116,7 @@ java_defaults { "service-connectivity-tiramisu-pre-jarjar", "services.core-vpn", "testables", - "cts-net-utils" + "cts-net-utils", ], libs: [ "android.net.ipsec.ike.stubs.module_lib", diff --git a/tests/unit/jni/Android.bp b/tests/unit/jni/Android.bp index 616da81583..57a157d2fc 100644 --- a/tests/unit/jni/Android.bp +++ b/tests/unit/jni/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/apex/Android.bp b/thread/apex/Android.bp index 28854f2a4c..edf000aef5 100644 --- a/thread/apex/Android.bp +++ b/thread/apex/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/demoapp/Android.bp b/thread/demoapp/Android.bp index da7a5f81a4..fcfd469345 100644 --- a/thread/demoapp/Android.bp +++ b/thread/demoapp/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/framework/Android.bp b/thread/framework/Android.bp index cc598d8c2f..846253c856 100644 --- a/thread/framework/Android.bp +++ b/thread/framework/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/service/Android.bp b/thread/service/Android.bp index 013223517a..6e2fac1dc7 100644 --- a/thread/service/Android.bp +++ b/thread/service/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/tests/cts/Android.bp b/thread/tests/cts/Android.bp index 2f38bfdf98..81e24da297 100644 --- a/thread/tests/cts/Android.bp +++ b/thread/tests/cts/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/tests/integration/Android.bp b/thread/tests/integration/Android.bp index ebd6a4d7e0..5989db589b 100644 --- a/thread/tests/integration/Android.bp +++ b/thread/tests/integration/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/thread/tests/unit/Android.bp b/thread/tests/unit/Android.bp index f59500e450..3365cd0ee0 100644 --- a/thread/tests/unit/Android.bp +++ b/thread/tests/unit/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_thread_network", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tools/Android.bp b/tools/Android.bp index 3ce76f61e5..b7b2aaafd5 100644 --- a/tools/Android.bp +++ b/tools/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_fwk_core_networking", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], }