[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, <add g3 doc link> Bug: 304529413 Test: N/A (cherry picked from https://android-review.googlesource.com/q/commit:a8ac702eb268d687d089ba218926ae6b17cda33c) Change-Id: I243f17b3f0ad7af9ffa15ca242456e36688733f5 Merged-In: I243f17b3f0ad7af9ffa15ca242456e36688733f5
This commit is contained in:
parent
3b9a82f7c9
commit
71086be55e
88 changed files with 243 additions and 114 deletions
|
|
@ -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"],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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"],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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: {
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
//
|
||||
|
||||
package {
|
||||
default_team: "trendy_team_fwk_core_networking",
|
||||
default_applicable_licenses: ["Android-Apache-2.0"],
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
],
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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"],
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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__",
|
||||
]
|
||||
],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
// limitations under the License.
|
||||
|
||||
package {
|
||||
default_team: "trendy_team_fwk_core_networking",
|
||||
default_applicable_licenses: ["Android-Apache-2.0"],
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
//
|
||||
|
||||
package {
|
||||
default_team: "trendy_team_fwk_core_networking",
|
||||
default_applicable_licenses: ["Android-Apache-2.0"],
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
// struct definitions shared with JNI
|
||||
//
|
||||
package {
|
||||
default_team: "trendy_team_fwk_core_networking",
|
||||
default_applicable_licenses: ["Android-Apache-2.0"],
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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"],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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"],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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"],
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
// limitations under the License.
|
||||
|
||||
package {
|
||||
default_team: "trendy_team_fwk_core_networking",
|
||||
default_applicable_licenses: ["Android-Apache-2.0"],
|
||||
}
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue