Merge "Replace "mts" with "mts-tethering"." am: 200e42063c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1864894 Change-Id: I86bfa59c32e41526ab05580d425e7dad7a4f7dd1
This commit is contained in:
@@ -77,7 +77,7 @@ android_test {
|
|||||||
defaults: ["TetheringIntegrationTestsDefaults"],
|
defaults: ["TetheringIntegrationTestsDefaults"],
|
||||||
test_suites: [
|
test_suites: [
|
||||||
"device-tests",
|
"device-tests",
|
||||||
"mts",
|
"mts-tethering",
|
||||||
],
|
],
|
||||||
compile_multilib: "both",
|
compile_multilib: "both",
|
||||||
jarjar_rules: ":NetworkStackJarJarRules",
|
jarjar_rules: ":NetworkStackJarJarRules",
|
||||||
@@ -129,7 +129,7 @@ android_test {
|
|||||||
platform_apis: true,
|
platform_apis: true,
|
||||||
min_sdk_version: "30",
|
min_sdk_version: "30",
|
||||||
target_sdk_version: "30",
|
target_sdk_version: "30",
|
||||||
test_suites: ["device-tests", "mts"],
|
test_suites: ["device-tests", "mts-tethering"],
|
||||||
test_config: "AndroidTest_Coverage.xml",
|
test_config: "AndroidTest_Coverage.xml",
|
||||||
defaults: ["libnetworkstackutilsjni_deps"],
|
defaults: ["libnetworkstackutilsjni_deps"],
|
||||||
static_libs: [
|
static_libs: [
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ android_test {
|
|||||||
platform_apis: true,
|
platform_apis: true,
|
||||||
test_suites: [
|
test_suites: [
|
||||||
"device-tests",
|
"device-tests",
|
||||||
"mts",
|
"mts-tethering",
|
||||||
],
|
],
|
||||||
static_libs: [
|
static_libs: [
|
||||||
"androidx.test.rules",
|
"androidx.test.rules",
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ android_test {
|
|||||||
platform_apis: true,
|
platform_apis: true,
|
||||||
test_suites: [
|
test_suites: [
|
||||||
"device-tests",
|
"device-tests",
|
||||||
"mts",
|
"mts-tethering",
|
||||||
],
|
],
|
||||||
defaults: ["TetheringTestsDefaults"],
|
defaults: ["TetheringTestsDefaults"],
|
||||||
compile_multilib: "both",
|
compile_multilib: "both",
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ android_test {
|
|||||||
min_sdk_version: "30",
|
min_sdk_version: "30",
|
||||||
// TODO: change to 31 as soon as it is available
|
// TODO: change to 31 as soon as it is available
|
||||||
target_sdk_version: "30",
|
target_sdk_version: "30",
|
||||||
test_suites: ["general-tests", "mts"],
|
test_suites: ["general-tests", "mts-tethering"],
|
||||||
defaults: [
|
defaults: [
|
||||||
"framework-connectivity-test-defaults",
|
"framework-connectivity-test-defaults",
|
||||||
"FrameworksNetTests-jni-defaults",
|
"FrameworksNetTests-jni-defaults",
|
||||||
|
|||||||
Reference in New Issue
Block a user