Clean up obsolete aliases for Truth.
Bug: 255714762 Test: presubmit Change-Id: If91e9af5409fed9d5ccdd13749a0f562c545d589
This commit is contained in:
parent
10da6d4e61
commit
739ed22507
8 changed files with 18 additions and 15 deletions
|
|
@ -26,7 +26,7 @@ android_test {
|
|||
"bluetooth-test-util-lib",
|
||||
"compatibility-device-util-axt",
|
||||
"ctstestrunner-axt",
|
||||
"truth-prebuilt",
|
||||
"truth",
|
||||
],
|
||||
libs: [
|
||||
"android.test.base",
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ android_test {
|
|||
"androidx.test.ext.junit",
|
||||
"androidx.test.rules",
|
||||
"junit",
|
||||
"truth-prebuilt",
|
||||
"truth",
|
||||
],
|
||||
test_suites: ["device-tests"],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ android_test {
|
|||
"androidx.test.uiautomator_uiautomator",
|
||||
"junit",
|
||||
"kotlin-test",
|
||||
"truth-prebuilt",
|
||||
"truth",
|
||||
],
|
||||
test_suites: ["device-tests"],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ android_test {
|
|||
"mockito-target-extended-minus-junit4",
|
||||
"platform-test-annotations",
|
||||
"service-nearby-pre-jarjar",
|
||||
"truth-prebuilt",
|
||||
"truth",
|
||||
// "Robolectric_all-target",
|
||||
],
|
||||
// these are needed for Extended Mockito
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ android_test {
|
|||
name: "RemoteAuthUnitTests",
|
||||
defaults: [
|
||||
"enable-remoteauth-targets",
|
||||
"mts-target-sdk-version-current"
|
||||
"mts-target-sdk-version-current",
|
||||
],
|
||||
sdk_version: "test_current",
|
||||
min_sdk_version: "31",
|
||||
|
|
@ -45,7 +45,7 @@ android_test {
|
|||
"mockito-target-extended-minus-junit4",
|
||||
"platform-test-annotations",
|
||||
"service-remoteauth-pre-jarjar",
|
||||
"truth-prebuilt",
|
||||
"truth",
|
||||
],
|
||||
// these are needed for Extended Mockito
|
||||
jni_libs: [
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ java_defaults {
|
|||
"junit-params",
|
||||
"modules-utils-build",
|
||||
"net-utils-framework-common",
|
||||
"truth-prebuilt",
|
||||
"truth",
|
||||
"TetheringIntegrationTestsBaseLib",
|
||||
],
|
||||
|
||||
|
|
@ -74,7 +74,10 @@ java_defaults {
|
|||
// devices.
|
||||
android_test {
|
||||
name: "CtsNetTestCases",
|
||||
defaults: ["CtsNetTestCasesDefaults", "ConnectivityNextEnableDefaults"],
|
||||
defaults: [
|
||||
"CtsNetTestCasesDefaults",
|
||||
"ConnectivityNextEnableDefaults",
|
||||
],
|
||||
static_libs: [
|
||||
"DhcpPacketLib",
|
||||
"NetworkStackApiCurrentShims",
|
||||
|
|
@ -129,7 +132,7 @@ java_defaults {
|
|||
}
|
||||
|
||||
android_test {
|
||||
name: "CtsNetTestCasesMaxTargetSdk33", // Must match CtsNetTestCasesMaxTargetSdk33 annotation.
|
||||
name: "CtsNetTestCasesMaxTargetSdk33", // Must match CtsNetTestCasesMaxTargetSdk33 annotation.
|
||||
defaults: ["CtsNetTestCasesMaxTargetSdkDefaults"],
|
||||
target_sdk_version: "33",
|
||||
package_name: "android.net.cts.maxtargetsdk33",
|
||||
|
|
@ -137,17 +140,17 @@ android_test {
|
|||
}
|
||||
|
||||
android_test {
|
||||
name: "CtsNetTestCasesMaxTargetSdk31", // Must match CtsNetTestCasesMaxTargetSdk31 annotation.
|
||||
name: "CtsNetTestCasesMaxTargetSdk31", // Must match CtsNetTestCasesMaxTargetSdk31 annotation.
|
||||
defaults: ["CtsNetTestCasesMaxTargetSdkDefaults"],
|
||||
target_sdk_version: "31",
|
||||
package_name: "android.net.cts.maxtargetsdk31", // CTS package names must be unique.
|
||||
package_name: "android.net.cts.maxtargetsdk31", // CTS package names must be unique.
|
||||
instrumentation_target_package: "android.net.cts.maxtargetsdk31",
|
||||
}
|
||||
|
||||
android_test {
|
||||
name: "CtsNetTestCasesMaxTargetSdk30", // Must match CtsNetTestCasesMaxTargetSdk30 annotation.
|
||||
name: "CtsNetTestCasesMaxTargetSdk30", // Must match CtsNetTestCasesMaxTargetSdk30 annotation.
|
||||
defaults: ["CtsNetTestCasesMaxTargetSdkDefaults"],
|
||||
target_sdk_version: "30",
|
||||
package_name: "android.net.cts.maxtargetsdk30", // CTS package names must be unique.
|
||||
package_name: "android.net.cts.maxtargetsdk30", // CTS package names must be unique.
|
||||
instrumentation_target_package: "android.net.cts.maxtargetsdk30",
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ android_test {
|
|||
"mockwebserver",
|
||||
"junit",
|
||||
"junit-params",
|
||||
"truth-prebuilt",
|
||||
"truth",
|
||||
],
|
||||
|
||||
platform_apis: true,
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ android_test {
|
|||
"compatibility-device-util-axt",
|
||||
"ctstestrunner-axt",
|
||||
"net-tests-utils",
|
||||
"truth-prebuilt",
|
||||
"truth",
|
||||
],
|
||||
libs: [
|
||||
"android.test.base",
|
||||
|
|
|
|||
Loading…
Reference in a new issue