Clean up obsolete aliases for Truth.
Bug: 255714762
Test: presubmit
Ignore-AOSP-First: merge conflict resolution
Change-Id: I8034c30eb8b4156da5a9288773c02e7284bb26a5
Merged-In: I8034c30eb8b4156da5a9288773c02e7284bb26a5
diff --git a/common/device-side/bedstead/activitycontext/Android.bp b/common/device-side/bedstead/activitycontext/Android.bp
index c15dee3..6327ce8 100644
--- a/common/device-side/bedstead/activitycontext/Android.bp
+++ b/common/device-side/bedstead/activitycontext/Android.bp
@@ -6,7 +6,7 @@
name: "ActivityContext",
sdk_version: "29",
srcs: [
- "src/main/java/**/*.java"
+ "src/main/java/**/*.java",
],
static_libs: [
"EventLib",
@@ -18,7 +18,7 @@
android_test {
name: "ActivityContextTest",
srcs: [
- "src/test/java/**/*.java"
+ "src/test/java/**/*.java",
],
test_suites: [
"general-tests",
@@ -28,7 +28,7 @@
"ActivityContext",
"androidx.test.ext.junit",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
"testng", // Used for assertThrows
],
manifest: "src/test/AndroidManifest.xml",
@@ -37,7 +37,7 @@
android_test {
name: "ActivityContextInstrumentOtherAppTest",
srcs: [
- "src/test/java/**/*.java"
+ "src/test/java/**/*.java",
],
test_suites: [
"general-tests",
@@ -46,10 +46,10 @@
"ActivityContext",
"androidx.test.ext.junit",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
"testng", // Used for assertThrows
],
manifest: "src/test/AndroidManifestInstrumentEmptyTestApp.xml",
data: [":EmptyTestApp"],
- test_config: "ActivityContextInstrumentOtherAppTest.xml"
+ test_config: "ActivityContextInstrumentOtherAppTest.xml",
}
diff --git a/common/device-side/bedstead/deviceadminapp/Android.bp b/common/device-side/bedstead/deviceadminapp/Android.bp
index 45fb723..a898ad4 100644
--- a/common/device-side/bedstead/deviceadminapp/Android.bp
+++ b/common/device-side/bedstead/deviceadminapp/Android.bp
@@ -11,13 +11,13 @@
],
srcs: ["src/main/java/**/*.java"],
resource_dirs: ["src/main/res"],
- min_sdk_version: "29"
+ min_sdk_version: "29",
}
android_test {
name: "DeviceAdminAppTest",
srcs: [
- "src/test/java/**/*.java"
+ "src/test/java/**/*.java",
],
test_suites: [
"general-tests",
@@ -30,8 +30,8 @@
"androidx.test.ext.junit",
"ctstestrunner-axt",
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
],
manifest: "src/test/AndroidManifest.xml",
- min_sdk_version: "29"
+ min_sdk_version: "29",
}
diff --git a/common/device-side/bedstead/eventlib/Android.bp b/common/device-side/bedstead/eventlib/Android.bp
index 0acb7a3..72cfeec 100644
--- a/common/device-side/bedstead/eventlib/Android.bp
+++ b/common/device-side/bedstead/eventlib/Android.bp
@@ -14,16 +14,16 @@
},
static_libs: [
"NeneInternal",
- "Queryable"
+ "Queryable",
],
manifest: "src/main/AndroidManifest.xml",
- min_sdk_version: "29"
+ min_sdk_version: "29",
}
android_test {
name: "EventLibTest",
srcs: [
- "src/test/java/**/*.java"
+ "src/test/java/**/*.java",
],
test_suites: [
"general-tests",
@@ -34,12 +34,12 @@
"ActivityContext",
"androidx.test.ext.junit",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
"testng", // for assertThrows
"compatibility-device-util-axt", // used for SystemUtil.runShellCommandOrThrow
],
resource_dirs: ["src/test/res"],
data: [":EventLibTestApp"],
manifest: "src/test/AndroidManifest.xml",
- min_sdk_version: "29"
+ min_sdk_version: "29",
}
diff --git a/common/device-side/bedstead/harrier/Android.bp b/common/device-side/bedstead/harrier/Android.bp
index 3b58abb..dedb50a 100644
--- a/common/device-side/bedstead/harrier/Android.bp
+++ b/common/device-side/bedstead/harrier/Android.bp
@@ -16,7 +16,6 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-
// TODO(276742331): Restore host/device separation
java_library_host {
name: "HarrierCommon",
@@ -30,7 +29,7 @@
"guava",
"NeneCommon",
"QueryableCommon",
- "truth-prebuilt",
+ "truth",
],
plugins: ["auto_annotation_plugin"],
@@ -48,7 +47,7 @@
"guava",
"NeneCommonAndroid",
"QueryableCommonAndroid",
- "truth-prebuilt",
+ "truth",
],
manifest: "src/main/AndroidManifest.xml",
@@ -94,7 +93,7 @@
"ctstestrunner-axt",
"compatibility-device-util-axt",
"platform-test-annotations",
- "truth-prebuilt",
+ "truth",
"testng", // for assertThrows
],
manifest: "src/test/AndroidManifest.xml",
diff --git a/common/device-side/bedstead/nene/Android.bp b/common/device-side/bedstead/nene/Android.bp
index 2d8ff04..e981ded 100644
--- a/common/device-side/bedstead/nene/Android.bp
+++ b/common/device-side/bedstead/nene/Android.bp
@@ -5,17 +5,17 @@
java_library_host {
name: "NeneCommon",
srcs: [
- "common/src/main/java/**/*.java"
+ "common/src/main/java/**/*.java",
],
}
android_library {
name: "NeneCommonAndroid",
srcs: [
- "common/src/main/java/**/*.java"
+ "common/src/main/java/**/*.java",
],
manifest: "src/main/AndroidManifestInternal.xml",
- min_sdk_version: "29"
+ min_sdk_version: "29",
}
// TODO(b/203507664): Remove NeneInternal once we no longer need QUERY_ALL_PACKAGES to install
@@ -23,7 +23,7 @@
name: "NeneInternal",
sdk_version: "test_current",
srcs: [
- "src/main/java/**/*.java"
+ "src/main/java/**/*.java",
],
manifest: "src/main/AndroidManifestInternal.xml",
static_libs: [
@@ -34,14 +34,14 @@
"RemoteFrameworkClasses",
"androidx.test.uiautomator_uiautomator",
],
- min_sdk_version: "29"
+ min_sdk_version: "29",
}
android_library {
name: "Nene",
sdk_version: "test_current",
srcs: [
- "src/main/java/**/*.java"
+ "src/main/java/**/*.java",
],
manifest: "src/main/AndroidManifest.xml",
static_libs: [
@@ -52,7 +52,7 @@
"RemoteFrameworkClasses",
"androidx.test.uiautomator_uiautomator",
],
- min_sdk_version: "29"
+ min_sdk_version: "29",
}
android_test {
@@ -72,12 +72,12 @@
"androidx.test.ext.junit",
"ctstestrunner-axt",
"compatibility-device-util-axt",
- "truth-prebuilt",
- "testng" // for assertThrows
+ "truth",
+ "testng", // for assertThrows
],
data: [":NeneTestApp1"],
manifest: "src/test/AndroidManifest.xml",
- min_sdk_version: "29"
+ min_sdk_version: "29",
}
android_test {
@@ -97,13 +97,13 @@
"androidx.test.ext.junit",
"ctstestrunner-axt",
"compatibility-device-util-axt",
- "truth-prebuilt",
- "testng" // for assertThrows
+ "truth",
+ "testng", // for assertThrows
],
data: [":NeneTestApp1"],
manifest: "src/test/AndroidManifest.xml",
min_sdk_version: "29",
- test_config: "InteractiveAndroidTest.xml"
+ test_config: "InteractiveAndroidTest.xml",
}
android_test {
@@ -129,14 +129,14 @@
],
manifest: "src/benchmarks/AndroidManifest.xml",
test_config: "src/benchmarks/AndroidTest.xml",
- min_sdk_version: "29"
+ min_sdk_version: "29",
}
android_test_helper_app {
name: "NeneTestApp1",
static_libs: [
- "EventLib"
+ "EventLib",
],
manifest: "testapps/TestApp1.xml",
- min_sdk_version: "29"
+ min_sdk_version: "29",
}
diff --git a/common/device-side/bedstead/queryable/Android.bp b/common/device-side/bedstead/queryable/Android.bp
index 941e098..25fe552 100644
--- a/common/device-side/bedstead/queryable/Android.bp
+++ b/common/device-side/bedstead/queryable/Android.bp
@@ -6,26 +6,26 @@
name: "QueryableCommon",
static_libs: [
"NeneCommon",
- "auto_value_annotations"
+ "auto_value_annotations",
],
srcs: [
"common/src/main/java/**/*.java",
],
- plugins: ["auto_annotation_plugin"]
+ plugins: ["auto_annotation_plugin"],
}
android_library {
name: "QueryableCommonAndroid",
static_libs: [
"NeneCommonAndroid",
- "auto_value_annotations"
+ "auto_value_annotations",
],
srcs: [
"common/src/main/java/**/*.java",
],
manifest: "src/main/AndroidManifest.xml",
min_sdk_version: "29",
- plugins: ["auto_annotation_plugin"]
+ plugins: ["auto_annotation_plugin"],
}
android_library {
@@ -36,17 +36,17 @@
],
static_libs: [
"androidx.test.ext.junit",
- "QueryableCommonAndroid"
+ "QueryableCommonAndroid",
],
manifest: "src/main/AndroidManifest.xml",
min_sdk_version: "29",
- plugins: ["auto_annotation_plugin"]
+ plugins: ["auto_annotation_plugin"],
}
android_test {
name: "BedsteadQueryableTest",
srcs: [
- "src/test/java/**/*.java"
+ "src/test/java/**/*.java",
],
test_suites: [
"general-tests",
@@ -58,9 +58,9 @@
"ActivityContext",
"androidx.test.ext.junit",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
"testng", // for assertThrows
],
manifest: "src/test/AndroidManifest.xml",
- min_sdk_version: "29"
+ min_sdk_version: "29",
}
diff --git a/common/device-side/bedstead/remoteaccountauthenticator/Android.bp b/common/device-side/bedstead/remoteaccountauthenticator/Android.bp
index 17e6fa4..f13b5e8 100644
--- a/common/device-side/bedstead/remoteaccountauthenticator/Android.bp
+++ b/common/device-side/bedstead/remoteaccountauthenticator/Android.bp
@@ -6,20 +6,20 @@
name: "RemoteAccountAuthenticator",
sdk_version: "test_current",
srcs: [
- "src/main/java/**/*.java"
+ "src/main/java/**/*.java",
],
static_libs: [
"Nene",
"TestApp",
],
manifest: "src/main/AndroidManifest.xml",
- min_sdk_version: "29"
+ min_sdk_version: "29",
}
android_test {
name: "RemoteAccountAuthenticatorTest",
srcs: [
- "src/test/java/**/*.java"
+ "src/test/java/**/*.java",
],
test_suites: [
"general-tests",
@@ -32,9 +32,9 @@
"EventLib",
"androidx.test.ext.junit",
"compatibility-device-util-axt",
- "truth-prebuilt",
- "testng" // for assertThrows
+ "truth",
+ "testng", // for assertThrows
],
manifest: "src/test/AndroidManifest.xml",
- min_sdk_version: "29"
-}
\ No newline at end of file
+ min_sdk_version: "29",
+}
diff --git a/common/device-side/bedstead/remotedpc/Android.bp b/common/device-side/bedstead/remotedpc/Android.bp
index a854127..bffbf68 100644
--- a/common/device-side/bedstead/remotedpc/Android.bp
+++ b/common/device-side/bedstead/remotedpc/Android.bp
@@ -6,20 +6,20 @@
name: "RemoteDPC",
sdk_version: "test_current",
srcs: [
- "src/main/java/**/*.java"
+ "src/main/java/**/*.java",
],
static_libs: [
"Nene",
"TestApp",
],
manifest: "src/main/AndroidManifest.xml",
- min_sdk_version: "29"
+ min_sdk_version: "29",
}
android_test {
name: "RemoteDPCTest",
srcs: [
- "src/test/java/**/*.java"
+ "src/test/java/**/*.java",
],
test_suites: [
"general-tests",
@@ -32,9 +32,9 @@
"EventLib",
"androidx.test.ext.junit",
"compatibility-device-util-axt",
- "truth-prebuilt",
- "testng" // for assertThrows
+ "truth",
+ "testng", // for assertThrows
],
manifest: "src/test/AndroidManifest.xml",
- min_sdk_version: "29"
-}
\ No newline at end of file
+ min_sdk_version: "29",
+}
diff --git a/common/device-side/bedstead/testapp/Android.bp b/common/device-side/bedstead/testapp/Android.bp
index e9d8de7..d179dce 100644
--- a/common/device-side/bedstead/testapp/Android.bp
+++ b/common/device-side/bedstead/testapp/Android.bp
@@ -77,7 +77,7 @@
"Harrier",
"EventLib",
"androidx.test.ext.junit",
- "truth-prebuilt",
+ "truth",
"testng", // for assertThrows
],
manifest: "src/test/AndroidManifest.xml",
diff --git a/common/device-side/util-axt/Android.bp b/common/device-side/util-axt/Android.bp
index e714233..bbfc74a 100644
--- a/common/device-side/util-axt/Android.bp
+++ b/common/device-side/util-axt/Android.bp
@@ -35,7 +35,7 @@
"ub-uiautomator",
"androidx.annotation_annotation",
"androidx.test.uiautomator_uiautomator",
- "truth-prebuilt",
+ "truth",
"modules-utils-build_system",
],
diff --git a/common/device-side/util-axt/tests/Android.bp b/common/device-side/util-axt/tests/Android.bp
index 73f1b34..c25bd62 100644
--- a/common/device-side/util-axt/tests/Android.bp
+++ b/common/device-side/util-axt/tests/Android.bp
@@ -25,7 +25,7 @@
"compatibility-device-util-axt",
"junit",
"testng", // TODO: remove once Android migrates to JUnit 4.12, which provide assertThrows
- "truth-prebuilt"
+ "truth",
],
sdk_version: "test_current",
diff --git a/hostsidetests/accounts/Android.bp b/hostsidetests/accounts/Android.bp
index 52a9d0c..0999cb0 100644
--- a/hostsidetests/accounts/Android.bp
+++ b/hostsidetests/accounts/Android.bp
@@ -26,7 +26,7 @@
"tradefed",
"platform-test-annotations-host",
"compatibility-host-util",
- "truth-prebuilt",
+ "truth",
"device-policy-log-verifier-util",
],
// tag this module as a cts test artifact
diff --git a/hostsidetests/accounts/test-apps/AccountManagerCrossUserApp/Android.bp b/hostsidetests/accounts/test-apps/AccountManagerCrossUserApp/Android.bp
index 86ec360..ff8bf09 100644
--- a/hostsidetests/accounts/test-apps/AccountManagerCrossUserApp/Android.bp
+++ b/hostsidetests/accounts/test-apps/AccountManagerCrossUserApp/Android.bp
@@ -21,7 +21,8 @@
defaults: ["cts_defaults"],
static_libs: [
"androidx.test.rules",
- "truth-prebuilt",],
+ "truth",
+ ],
srcs: ["src/**/*.java"],
// tag this module as a cts test artifact
test_suites: [
diff --git a/hostsidetests/appcompat/compatchanges/app/Android.bp b/hostsidetests/appcompat/compatchanges/app/Android.bp
index a54e141..a2c94d7 100644
--- a/hostsidetests/appcompat/compatchanges/app/Android.bp
+++ b/hostsidetests/appcompat/compatchanges/app/Android.bp
@@ -29,7 +29,7 @@
static_libs: [
"ctstestrunner-axt",
"testng",
- "truth-prebuilt",
+ "truth",
],
// Tag this module as a cts test artifact
diff --git a/hostsidetests/appsearch/Android.bp b/hostsidetests/appsearch/Android.bp
index ef30e13..0adc08a 100644
--- a/hostsidetests/appsearch/Android.bp
+++ b/hostsidetests/appsearch/Android.bp
@@ -29,7 +29,7 @@
"tools-common-prebuilt",
"cts-tradefed",
"tradefed",
- "truth-prebuilt",
+ "truth",
],
test_suites: [
"cts",
diff --git a/hostsidetests/appsecurity/Android.bp b/hostsidetests/appsecurity/Android.bp
index 48afce0..c23a716 100644
--- a/hostsidetests/appsecurity/Android.bp
+++ b/hostsidetests/appsecurity/Android.bp
@@ -29,7 +29,7 @@
"cts-tradefed",
"tradefed",
"compatibility-host-util",
- "truth-prebuilt",
+ "truth",
"hamcrest-library",
],
diff --git a/hostsidetests/appsecurity/test-apps/AppDataIsolationTestApp/Android.bp b/hostsidetests/appsecurity/test-apps/AppDataIsolationTestApp/Android.bp
index 1643c6e..a52e9e6 100644
--- a/hostsidetests/appsecurity/test-apps/AppDataIsolationTestApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AppDataIsolationTestApp/Android.bp
@@ -19,9 +19,19 @@
android_test_helper_app {
name: "CtsAppDataIsolationAppA",
defaults: ["cts_support_defaults"],
- srcs: ["common/src/**/*.java", "AppA/src/**/*.java", "AppA/aidl/**/*.aidl"],
+ srcs: [
+ "common/src/**/*.java",
+ "AppA/src/**/*.java",
+ "AppA/aidl/**/*.aidl",
+ ],
sdk_version: "test_current",
- static_libs: ["androidx.test.rules", "truth-prebuilt", "testng", "ub-uiautomator", "compatibility-device-util-axt"],
+ static_libs: [
+ "androidx.test.rules",
+ "truth",
+ "testng",
+ "ub-uiautomator",
+ "compatibility-device-util-axt",
+ ],
libs: ["android.test.base"],
// tag this module as a cts test artifact
test_suites: [
@@ -38,9 +48,19 @@
android_test_helper_app {
name: "CtsAppDataIsolationAppSharedA",
defaults: ["cts_support_defaults"],
- srcs: ["common/src/**/*.java", "AppA/src/**/*.java", "AppA/aidl/**/*.aidl"],
+ srcs: [
+ "common/src/**/*.java",
+ "AppA/src/**/*.java",
+ "AppA/aidl/**/*.aidl",
+ ],
sdk_version: "test_current",
- static_libs: ["androidx.test.rules", "truth-prebuilt", "testng", "ub-uiautomator", "compatibility-device-util-axt"],
+ static_libs: [
+ "androidx.test.rules",
+ "truth",
+ "testng",
+ "ub-uiautomator",
+ "compatibility-device-util-axt",
+ ],
libs: ["android.test.base"],
// tag this module as a cts test artifact
test_suites: [
@@ -57,9 +77,19 @@
android_test_helper_app {
name: "CtsAppDataIsolationAppDirectBootA",
defaults: ["cts_support_defaults"],
- srcs: ["common/src/**/*.java", "AppA/src/**/*.java", "AppA/aidl/**/*.aidl"],
+ srcs: [
+ "common/src/**/*.java",
+ "AppA/src/**/*.java",
+ "AppA/aidl/**/*.aidl",
+ ],
sdk_version: "test_current",
- static_libs: ["androidx.test.rules", "truth-prebuilt", "testng", "ub-uiautomator", "compatibility-device-util-axt"],
+ static_libs: [
+ "androidx.test.rules",
+ "truth",
+ "testng",
+ "ub-uiautomator",
+ "compatibility-device-util-axt",
+ ],
libs: ["android.test.base"],
// tag this module as a cts test artifact
test_suites: [
@@ -76,9 +106,19 @@
android_test_helper_app {
name: "CtsAppDataIsolationAppApi29A",
defaults: ["cts_support_defaults"],
- srcs: ["common/src/**/*.java", "AppA/src/**/*.java", "AppA/aidl/**/*.aidl"],
+ srcs: [
+ "common/src/**/*.java",
+ "AppA/src/**/*.java",
+ "AppA/aidl/**/*.aidl",
+ ],
sdk_version: "test_current",
- static_libs: ["androidx.test.rules", "truth-prebuilt", "testng", "ub-uiautomator", "compatibility-device-util-axt"],
+ static_libs: [
+ "androidx.test.rules",
+ "truth",
+ "testng",
+ "ub-uiautomator",
+ "compatibility-device-util-axt",
+ ],
libs: ["android.test.base"],
// tag this module as a cts test artifact
test_suites: [
@@ -95,9 +135,18 @@
android_test_helper_app {
name: "CtsAppDataIsolationAppB",
defaults: ["cts_support_defaults"],
- srcs: ["common/src/**/*.java", "AppB/src/**/*.java"],
+ srcs: [
+ "common/src/**/*.java",
+ "AppB/src/**/*.java",
+ ],
sdk_version: "test_current",
- static_libs: ["androidx.test.rules", "truth-prebuilt", "testng", "ub-uiautomator", "compatibility-device-util-axt"],
+ static_libs: [
+ "androidx.test.rules",
+ "truth",
+ "testng",
+ "ub-uiautomator",
+ "compatibility-device-util-axt",
+ ],
libs: ["android.test.base"],
// tag this module as a cts test artifact
test_suites: [
@@ -114,9 +163,17 @@
android_test_helper_app {
name: "CtsAppDataIsolationAppSharedB",
defaults: ["cts_support_defaults"],
- srcs: ["common/src/**/*.java", "AppB/src/**/*.java"],
+ srcs: [
+ "common/src/**/*.java",
+ "AppB/src/**/*.java",
+ ],
sdk_version: "test_current",
- static_libs: ["androidx.test.rules", "truth-prebuilt", "testng", "compatibility-device-util-axt"],
+ static_libs: [
+ "androidx.test.rules",
+ "truth",
+ "testng",
+ "compatibility-device-util-axt",
+ ],
libs: ["android.test.base"],
// tag this module as a cts test artifact
test_suites: [
diff --git a/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.bp b/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.bp
index e504cd5..bf4df09 100644
--- a/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.bp
@@ -27,7 +27,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"ub-uiautomator",
- "truth-prebuilt",
+ "truth",
],
libs: ["android.test.base"],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.bp
index e7dc54a..284868a 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.bp
@@ -25,7 +25,7 @@
"cts-aia-util",
"androidx.test.rules",
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
],
libs: ["android.test.base"],
// tag this module as a cts test artifact
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.bp b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.bp
index 5dcd148..2c0c1b8 100644
--- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.bp
@@ -35,7 +35,7 @@
static_libs: [
"ctstestrunner-axt",
"androidx.test.rules",
- "truth-prebuilt",
+ "truth",
],
srcs: ["src/**/*.java"],
// Generate a locale split.
@@ -55,7 +55,7 @@
static_libs: [
"ctstestrunner-axt",
"androidx.test.rules",
- "truth-prebuilt",
+ "truth",
],
srcs: ["src/**/*.java"],
// Generate a locale split.
diff --git a/hostsidetests/appsecurity/test-apps/NoDataStorageApp/Android.bp b/hostsidetests/appsecurity/test-apps/NoDataStorageApp/Android.bp
index 146524c..3599388 100644
--- a/hostsidetests/appsecurity/test-apps/NoDataStorageApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/NoDataStorageApp/Android.bp
@@ -23,7 +23,7 @@
static_libs: [
"androidx.test.runner",
"androidx.test.core",
- "truth-prebuilt",
+ "truth",
],
srcs: ["src/**/*.java"],
test_suites: [
diff --git a/hostsidetests/appsecurity/test-apps/PackageInstallerPermissionRequestApp/Android.bp b/hostsidetests/appsecurity/test-apps/PackageInstallerPermissionRequestApp/Android.bp
index c9150a8..22fbd46 100644
--- a/hostsidetests/appsecurity/test-apps/PackageInstallerPermissionRequestApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/PackageInstallerPermissionRequestApp/Android.bp
@@ -21,7 +21,7 @@
defaults: ["cts_defaults"],
static_libs: [
"androidx.test.rules",
- "truth-prebuilt",
+ "truth",
"CtsPkgInstallerConstants",
],
srcs: ["src/**/*.kt"],
diff --git a/hostsidetests/appsecurity/test-apps/SettingsProviderInvalidKeyTestApp/Android.bp b/hostsidetests/appsecurity/test-apps/SettingsProviderInvalidKeyTestApp/Android.bp
index cb1988b..85cf91a 100644
--- a/hostsidetests/appsecurity/test-apps/SettingsProviderInvalidKeyTestApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SettingsProviderInvalidKeyTestApp/Android.bp
@@ -24,7 +24,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"junit",
- "truth-prebuilt",
+ "truth",
"testng", // for assertThrows
],
libs: [
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/Android.bp b/hostsidetests/appsecurity/test-apps/SplitApp/Android.bp
index 749de46..6edc9eb 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/Android.bp
@@ -28,7 +28,7 @@
aapt_include_all_resources: true,
static_libs: [
"androidx.test.rules",
- "truth-prebuilt",
+ "truth",
"hamcrest-library",
"compatibility-device-util-axt",
],
@@ -36,7 +36,7 @@
"android.test.runner.stubs",
"android.test.base.stubs",
],
- target_sdk_version: "current"
+ target_sdk_version: "current",
}
android_test_helper_app {
@@ -141,10 +141,16 @@
android_test_helper_app {
name: "CtsSplitAppRevisionA",
defaults: ["CtsSplitAppDefaults"],
- srcs: ["src/**/*.java", "revision_a/src/**/*.java"],
- resource_dirs: ["res", "revision_a/res"],
+ srcs: [
+ "src/**/*.java",
+ "revision_a/src/**/*.java",
+ ],
+ resource_dirs: [
+ "res",
+ "revision_a/res",
+ ],
asset_dirs: ["revision_a/assets"],
- manifest : "revision_a/AndroidManifest.xml",
+ manifest: "revision_a/AndroidManifest.xml",
package_splits: ["v7"],
certificate: ":cts-testkey1",
aaptflags: [
@@ -164,7 +170,7 @@
android_test_helper_app {
name: "CtsSplitInstantApp",
defaults: ["CtsSplitAppDefaults"],
- manifest : "instantapp/AndroidManifest.xml",
+ manifest: "instantapp/AndroidManifest.xml",
certificate: ":cts-testkey1",
aaptflags: [
"--version-code 100",
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.bp b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.bp
index b7ea673..873b10a 100644
--- a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.bp
@@ -28,7 +28,7 @@
"CtsPermissionDeclareUtilLib",
"androidx.test.rules",
"testng",
- "truth-prebuilt",
+ "truth",
],
libs: ["android.test.base"],
// tag this module as a cts test artifact
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp
index 607f13f..1d7988a 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp
@@ -24,7 +24,7 @@
sdk_version: "test_current",
certificate: ":cts-testkey1",
static_libs: [
- "truth-prebuilt",
+ "truth",
"androidx.test.rules",
"compatibility-device-util-axt",
],
diff --git a/hostsidetests/backup/Android.bp b/hostsidetests/backup/Android.bp
index f1f4ae4..283542b 100644
--- a/hostsidetests/backup/Android.bp
+++ b/hostsidetests/backup/Android.bp
@@ -32,7 +32,7 @@
"compatibility-host-util",
],
static_libs: [
- "truth-prebuilt",
+ "truth",
"platformprotos",
],
data: [
diff --git a/hostsidetests/backup/AutoRestoreApp/Android.bp b/hostsidetests/backup/AutoRestoreApp/Android.bp
index fbab3cb..8cd295c 100644
--- a/hostsidetests/backup/AutoRestoreApp/Android.bp
+++ b/hostsidetests/backup/AutoRestoreApp/Android.bp
@@ -23,7 +23,7 @@
"androidx.test.rules",
"platform-test-annotations",
"testng",
- "truth-prebuilt",
+ "truth",
"compatibility-device-util-axt",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/backup/BackupTransportApp/Android.bp b/hostsidetests/backup/BackupTransportApp/Android.bp
index 7a4484f..d6d8e45 100644
--- a/hostsidetests/backup/BackupTransportApp/Android.bp
+++ b/hostsidetests/backup/BackupTransportApp/Android.bp
@@ -23,7 +23,7 @@
"androidx.test.rules",
"platform-test-annotations",
"testng",
- "truth-prebuilt",
+ "truth",
],
srcs: ["src/**/*.java"],
// tag this module as a cts test artifact
diff --git a/hostsidetests/backup/PreservedSettingsApp/Android.bp b/hostsidetests/backup/PreservedSettingsApp/Android.bp
index 71859a9..1308a62 100644
--- a/hostsidetests/backup/PreservedSettingsApp/Android.bp
+++ b/hostsidetests/backup/PreservedSettingsApp/Android.bp
@@ -23,7 +23,7 @@
"androidx.test.rules",
"platform-test-annotations",
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
],
srcs: ["src/**/*.java"],
// tag this module as a cts test artifact
diff --git a/hostsidetests/backup/ProfileFullBackupApp/Android.bp b/hostsidetests/backup/ProfileFullBackupApp/Android.bp
index 1c614e2..e192d94 100644
--- a/hostsidetests/backup/ProfileFullBackupApp/Android.bp
+++ b/hostsidetests/backup/ProfileFullBackupApp/Android.bp
@@ -22,7 +22,7 @@
static_libs: [
"androidx.test.rules",
"platform-test-annotations",
- "truth-prebuilt",
+ "truth",
],
srcs: ["src/**/*.java"],
// tag this module as a cts test artifact
diff --git a/hostsidetests/backup/ProfileKeyValueApp/Android.bp b/hostsidetests/backup/ProfileKeyValueApp/Android.bp
index 37b676f..89d343a 100644
--- a/hostsidetests/backup/ProfileKeyValueApp/Android.bp
+++ b/hostsidetests/backup/ProfileKeyValueApp/Android.bp
@@ -22,7 +22,7 @@
static_libs: [
"androidx.test.rules",
"platform-test-annotations",
- "truth-prebuilt",
+ "truth",
],
srcs: ["src/**/*.java"],
// tag this module as a cts test artifact
diff --git a/hostsidetests/backup/RestoreSessionTest/Android.bp b/hostsidetests/backup/RestoreSessionTest/Android.bp
index 206db8a..b70b01c 100644
--- a/hostsidetests/backup/RestoreSessionTest/Android.bp
+++ b/hostsidetests/backup/RestoreSessionTest/Android.bp
@@ -22,7 +22,7 @@
static_libs: [
"androidx.test.rules",
"platform-test-annotations",
- "truth-prebuilt",
+ "truth",
],
srcs: [
"src/**/*.java",
diff --git a/hostsidetests/backup/includeexcludeapp/Android.bp b/hostsidetests/backup/includeexcludeapp/Android.bp
index 682101c..1b89379 100644
--- a/hostsidetests/backup/includeexcludeapp/Android.bp
+++ b/hostsidetests/backup/includeexcludeapp/Android.bp
@@ -22,7 +22,7 @@
static_libs: [
"androidx.test.rules",
"platform-test-annotations",
- "truth-prebuilt",
+ "truth",
],
sdk_version: "current",
}
diff --git a/hostsidetests/backup/restoresessionapp1/Android.bp b/hostsidetests/backup/restoresessionapp1/Android.bp
index 5706063..10003b2 100644
--- a/hostsidetests/backup/restoresessionapp1/Android.bp
+++ b/hostsidetests/backup/restoresessionapp1/Android.bp
@@ -21,11 +21,11 @@
defaults: ["cts_defaults"],
static_libs: [
"androidx.test.rules",
- "truth-prebuilt",
+ "truth",
"CtsRestoreSessionApp",
],
srcs: [
- "src/**/*.java"
+ "src/**/*.java",
],
v4_signature: true,
// tag this module as a cts test artifact
diff --git a/hostsidetests/backup/restoresessionapp2/Android.bp b/hostsidetests/backup/restoresessionapp2/Android.bp
index a724468..f8992b4 100644
--- a/hostsidetests/backup/restoresessionapp2/Android.bp
+++ b/hostsidetests/backup/restoresessionapp2/Android.bp
@@ -21,11 +21,11 @@
defaults: ["cts_defaults"],
static_libs: [
"androidx.test.rules",
- "truth-prebuilt",
+ "truth",
"CtsRestoreSessionApp",
],
srcs: [
- "src/**/*.java"
+ "src/**/*.java",
],
v4_signature: true,
// tag this module as a cts test artifact
diff --git a/hostsidetests/biometrics/Android.bp b/hostsidetests/biometrics/Android.bp
index 350927f..7882d44 100644
--- a/hostsidetests/biometrics/Android.bp
+++ b/hostsidetests/biometrics/Android.bp
@@ -32,7 +32,7 @@
"compatibility-host-util",
"cts-tradefed",
"tradefed",
- "truth-prebuilt",
+ "truth",
],
static_libs: [
diff --git a/hostsidetests/biometrics/app/Android.bp b/hostsidetests/biometrics/app/Android.bp
index 8ec56fa..2f24d4e 100644
--- a/hostsidetests/biometrics/app/Android.bp
+++ b/hostsidetests/biometrics/app/Android.bp
@@ -34,7 +34,7 @@
"cts-input-lib",
"cts-wm-util",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
],
sdk_version: "test_current",
}
diff --git a/hostsidetests/blobstore/Android.bp b/hostsidetests/blobstore/Android.bp
index 207b250..8867330 100644
--- a/hostsidetests/blobstore/Android.bp
+++ b/hostsidetests/blobstore/Android.bp
@@ -24,7 +24,7 @@
"tools-common-prebuilt",
"cts-tradefed",
"tradefed",
- "truth-prebuilt"
+ "truth",
],
static_libs: [
"cts-statsd-atom-host-test-utils",
@@ -32,7 +32,7 @@
// Tag this module as a cts test artifact
test_suites: [
"cts",
- "general-tests"
+ "general-tests",
],
data: [
":CtsBlobStoreHostTestHelper",
@@ -43,66 +43,66 @@
}
android_test_helper_app {
- name: "CtsBlobStoreHostTestHelper",
- srcs: ["test-apps/BlobStoreHostTestHelper/src/**/*.java"],
- static_libs: [
- "compatibility-device-util-axt",
- "androidx.test.ext.junit",
- "androidx.test.rules",
- "BlobStoreTestUtils",
- "truth-prebuilt",
- "testng",
- ],
- manifest : "test-apps/BlobStoreHostTestHelper/AndroidManifest.xml",
- sdk_version: "test_current",
- // Tag this module as a cts test artifact
- test_suites: [
- "general-tests"
- ]
+ name: "CtsBlobStoreHostTestHelper",
+ srcs: ["test-apps/BlobStoreHostTestHelper/src/**/*.java"],
+ static_libs: [
+ "compatibility-device-util-axt",
+ "androidx.test.ext.junit",
+ "androidx.test.rules",
+ "BlobStoreTestUtils",
+ "truth",
+ "testng",
+ ],
+ manifest: "test-apps/BlobStoreHostTestHelper/AndroidManifest.xml",
+ sdk_version: "test_current",
+ // Tag this module as a cts test artifact
+ test_suites: [
+ "general-tests",
+ ],
}
android_test_helper_app {
- name: "CtsBlobStoreHostTestHelperDev",
- srcs: ["test-apps/BlobStoreHostTestHelper/src/**/*.java"],
- static_libs: [
- "compatibility-device-util-axt",
- "androidx.test.ext.junit",
- "androidx.test.rules",
- "BlobStoreTestUtils",
- "truth-prebuilt",
- "testng",
- ],
- manifest : "test-apps/BlobStoreHostTestHelper/AndroidManifest_withPrivPerm.xml",
- aaptflags: [
- "--rename-manifest-package com.android.cts.device.blob.dev",
- "--rename-instrumentation-target-package com.android.cts.device.blob.dev"
- ],
- sdk_version: "test_current",
- // Tag this module as a cts test artifact
- test_suites: [
- "general-tests"
- ]
+ name: "CtsBlobStoreHostTestHelperDev",
+ srcs: ["test-apps/BlobStoreHostTestHelper/src/**/*.java"],
+ static_libs: [
+ "compatibility-device-util-axt",
+ "androidx.test.ext.junit",
+ "androidx.test.rules",
+ "BlobStoreTestUtils",
+ "truth",
+ "testng",
+ ],
+ manifest: "test-apps/BlobStoreHostTestHelper/AndroidManifest_withPrivPerm.xml",
+ aaptflags: [
+ "--rename-manifest-package com.android.cts.device.blob.dev",
+ "--rename-instrumentation-target-package com.android.cts.device.blob.dev",
+ ],
+ sdk_version: "test_current",
+ // Tag this module as a cts test artifact
+ test_suites: [
+ "general-tests",
+ ],
}
android_test_helper_app {
- name: "CtsBlobStoreHostTestHelperAssist",
- srcs: ["test-apps/BlobStoreHostTestHelper/src/**/*.java"],
- static_libs: [
- "compatibility-device-util-axt",
- "androidx.test.ext.junit",
- "androidx.test.rules",
- "BlobStoreTestUtils",
- "truth-prebuilt",
- "testng"
- ],
- manifest : "test-apps/BlobStoreHostTestHelper/AndroidManifest_withAssistRole.xml",
- aaptflags: [
- "--rename-manifest-package com.android.cts.device.blob.assist",
- "--rename-instrumentation-target-package com.android.cts.device.blob.assist"
- ],
- sdk_version: "test_current",
- // Tag this module as a cts test artifact
- test_suites: [
- "general-tests"
- ]
+ name: "CtsBlobStoreHostTestHelperAssist",
+ srcs: ["test-apps/BlobStoreHostTestHelper/src/**/*.java"],
+ static_libs: [
+ "compatibility-device-util-axt",
+ "androidx.test.ext.junit",
+ "androidx.test.rules",
+ "BlobStoreTestUtils",
+ "truth",
+ "testng",
+ ],
+ manifest: "test-apps/BlobStoreHostTestHelper/AndroidManifest_withAssistRole.xml",
+ aaptflags: [
+ "--rename-manifest-package com.android.cts.device.blob.assist",
+ "--rename-instrumentation-target-package com.android.cts.device.blob.assist",
+ ],
+ sdk_version: "test_current",
+ // Tag this module as a cts test artifact
+ test_suites: [
+ "general-tests",
+ ],
}
diff --git a/hostsidetests/calllog/app/Android.bp b/hostsidetests/calllog/app/Android.bp
index 7a9967c..1b6529b 100644
--- a/hostsidetests/calllog/app/Android.bp
+++ b/hostsidetests/calllog/app/Android.bp
@@ -27,7 +27,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"androidx.test.uiautomator_uiautomator",
- "truth-prebuilt",
+ "truth",
],
libs: ["android.test.base"],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/car/Android.bp b/hostsidetests/car/Android.bp
index c57a6e3..fbf0c28 100644
--- a/hostsidetests/car/Android.bp
+++ b/hostsidetests/car/Android.bp
@@ -34,7 +34,7 @@
"tradefed",
"compatibility-host-util",
"libprotobuf-java-full",
- "truth-prebuilt",
+ "truth",
],
// tag this module as a cts test artifact
test_suites: [
diff --git a/hostsidetests/car/nonrecoverable/Android.bp b/hostsidetests/car/nonrecoverable/Android.bp
index d5b1729..4a1a5b2 100644
--- a/hostsidetests/car/nonrecoverable/Android.bp
+++ b/hostsidetests/car/nonrecoverable/Android.bp
@@ -27,7 +27,7 @@
"cts-tradefed",
"tradefed",
"compatibility-host-util",
- "truth-prebuilt",
+ "truth",
],
// tag this module as a cts test artifact
test_suites: [
diff --git a/hostsidetests/car_builtin/Android.bp b/hostsidetests/car_builtin/Android.bp
index 3550862..bd8ea7f 100644
--- a/hostsidetests/car_builtin/Android.bp
+++ b/hostsidetests/car_builtin/Android.bp
@@ -26,7 +26,7 @@
libs: [
"tradefed",
"compatibility-host-util",
- "truth-prebuilt",
+ "truth",
],
// tag this module as a cts test artifact
test_suites: [
diff --git a/hostsidetests/compilation/Android.bp b/hostsidetests/compilation/Android.bp
index f7c1b3b..806dc45 100644
--- a/hostsidetests/compilation/Android.bp
+++ b/hostsidetests/compilation/Android.bp
@@ -37,7 +37,7 @@
"tradefed",
"compatibility-host-util",
"guava",
- "truth-prebuilt",
+ "truth",
],
}
diff --git a/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileApp/Android.bp b/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileApp/Android.bp
index 241c47d..d2f7363 100644
--- a/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileApp/Android.bp
+++ b/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileApp/Android.bp
@@ -20,8 +20,8 @@
name: "CtsContextCrossProfileApp",
defaults: ["cts_defaults"],
static_libs: [
- "androidx.test.rules",
- "truth-prebuilt",
+ "androidx.test.rules",
+ "truth",
],
srcs: ["src/**/*.java"],
// tag this module as a cts test artifact
diff --git a/hostsidetests/ctsverifier/Android.bp b/hostsidetests/ctsverifier/Android.bp
index 4d33a72..87e1394 100644
--- a/hostsidetests/ctsverifier/Android.bp
+++ b/hostsidetests/ctsverifier/Android.bp
@@ -23,7 +23,7 @@
// "compatibility-host-util",
// "InteractiveCommon",
// "HarrierCommon",
-// "truth-prebuilt",
+// "truth",
// ],
// libs: [
// "tools-common-prebuilt",
diff --git a/hostsidetests/devicepolicy/Android.bp b/hostsidetests/devicepolicy/Android.bp
index b09e4db..73bab2d 100644
--- a/hostsidetests/devicepolicy/Android.bp
+++ b/hostsidetests/devicepolicy/Android.bp
@@ -25,7 +25,7 @@
"cts-tradefed",
"tradefed",
"guava",
- "truth-prebuilt",
+ "truth",
],
// tag this module as a cts test artifact
test_suites: [
diff --git a/hostsidetests/devicepolicy/app/CertInstaller/Android.bp b/hostsidetests/devicepolicy/app/CertInstaller/Android.bp
index d178a9e..198e5d5 100644
--- a/hostsidetests/devicepolicy/app/CertInstaller/Android.bp
+++ b/hostsidetests/devicepolicy/app/CertInstaller/Android.bp
@@ -29,7 +29,7 @@
static_libs: [
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
"testng",
"cts-security-test-support-library",
"devicepolicy-deviceside-common",
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledApp/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledApp/Android.bp
index ffca3b3..8956e0a 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledApp/Android.bp
@@ -26,7 +26,7 @@
"ctstestrunner-axt",
"compatibility-device-util-axt",
"androidx.test.rules",
- "truth-prebuilt",
+ "truth",
"ub-uiautomator",
],
min_sdk_version: "29",
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledNoPermsApp/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledNoPermsApp/Android.bp
index 30ce152..b68b23c 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledNoPermsApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledNoPermsApp/Android.bp
@@ -26,7 +26,7 @@
"ctstestrunner-axt",
"compatibility-device-util-axt",
"androidx.test.rules",
- "truth-prebuilt",
+ "truth",
"ub-uiautomator",
],
min_sdk_version: "29",
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileNotEnabledApp/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileNotEnabledApp/Android.bp
index 49ca07f..7f8e50d 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileNotEnabledApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileNotEnabledApp/Android.bp
@@ -26,7 +26,7 @@
"ctstestrunner-axt",
"compatibility-device-util-axt",
"androidx.test.rules",
- "truth-prebuilt",
+ "truth",
"ub-uiautomator",
],
min_sdk_version: "29",
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileUserEnabledApp/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileUserEnabledApp/Android.bp
index 323b377..127221b 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileUserEnabledApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileUserEnabledApp/Android.bp
@@ -26,7 +26,7 @@
"ctstestrunner-axt",
"compatibility-device-util-axt",
"androidx.test.rules",
- "truth-prebuilt",
+ "truth",
"ub-uiautomator",
],
min_sdk_version: "29",
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/ModifyQuietModeEnabledApp/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/ModifyQuietModeEnabledApp/Android.bp
index 5ea1218..03c60c2 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/ModifyQuietModeEnabledApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/ModifyQuietModeEnabledApp/Android.bp
@@ -26,7 +26,7 @@
"ctstestrunner-axt",
"compatibility-device-util-axt",
"androidx.test.rules",
- "truth-prebuilt",
+ "truth",
"ub-uiautomator",
],
min_sdk_version: "29",
diff --git a/hostsidetests/devicepolicy/app/DelegateApp/Android.bp b/hostsidetests/devicepolicy/app/DelegateApp/Android.bp
index ab815d5..373090e 100644
--- a/hostsidetests/devicepolicy/app/DelegateApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/DelegateApp/Android.bp
@@ -30,7 +30,7 @@
"ctstestrunner-axt",
"androidx.test.rules",
"ub-uiautomator",
- "truth-prebuilt",
+ "truth",
"devicepolicy-deviceside-common",
],
sdk_version: "current",
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/Android.bp b/hostsidetests/devicepolicy/app/DeviceOwner/Android.bp
index e65bc93..c4c8471 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/Android.bp
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/Android.bp
@@ -39,7 +39,7 @@
"compatibility-device-util-axt",
"androidx.test.rules",
"cts-security-test-support-library",
- "truth-prebuilt",
+ "truth",
"androidx.legacy_legacy-support-v4",
"devicepolicy-deviceside-common",
"DpmWrapper",
diff --git a/hostsidetests/devicepolicy/app/IntentSender/Android.bp b/hostsidetests/devicepolicy/app/IntentSender/Android.bp
index 0777be0..3ddb200 100644
--- a/hostsidetests/devicepolicy/app/IntentSender/Android.bp
+++ b/hostsidetests/devicepolicy/app/IntentSender/Android.bp
@@ -28,7 +28,7 @@
"ctstestrunner-axt",
"ub-uiautomator",
"androidx.legacy_legacy-support-v4",
- "truth-prebuilt",
+ "truth",
],
platform_apis: true,
// tag this module as a cts test artifact
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp b/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp
index 7a0a26b..0b1c65f 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp
@@ -31,7 +31,7 @@
"ub-uiautomator",
"androidx.test.rules",
"guava",
- "truth-prebuilt",
+ "truth",
"testng",
"androidx.legacy_legacy-support-v4",
"devicepolicy-deviceside-common",
diff --git a/hostsidetests/devicepolicy/app/SuspensionChecker/Android.bp b/hostsidetests/devicepolicy/app/SuspensionChecker/Android.bp
index 7f55cf2..4372fff 100644
--- a/hostsidetests/devicepolicy/app/SuspensionChecker/Android.bp
+++ b/hostsidetests/devicepolicy/app/SuspensionChecker/Android.bp
@@ -22,7 +22,7 @@
srcs: ["src/**/*.java"],
manifest: "AndroidManifest.xml",
static_libs: [
- "truth-prebuilt",
+ "truth",
"ctstestrunner-axt",
"androidx.legacy_legacy-support-v4",
"androidx.test.uiautomator_uiautomator",
diff --git a/hostsidetests/dumpsys/Android.bp b/hostsidetests/dumpsys/Android.bp
index 99a3cbf..577f8c5 100644
--- a/hostsidetests/dumpsys/Android.bp
+++ b/hostsidetests/dumpsys/Android.bp
@@ -24,7 +24,7 @@
libs: [
"cts-tradefed",
"tradefed",
- "truth-prebuilt",
+ "truth",
],
// tag this module as a cts test artifact
test_suites: [
diff --git a/hostsidetests/graphics/displaymode/app/Android.bp b/hostsidetests/graphics/displaymode/app/Android.bp
index e7ab970..ea00bfe 100644
--- a/hostsidetests/graphics/displaymode/app/Android.bp
+++ b/hostsidetests/graphics/displaymode/app/Android.bp
@@ -38,7 +38,7 @@
"mockito-target-minus-junit4",
"SurfaceFlingerProperties",
"testng",
- "truth-prebuilt",
+ "truth",
],
// Tag this module as a cts test artifact
diff --git a/hostsidetests/graphics/framerateoverride/app/Android.bp b/hostsidetests/graphics/framerateoverride/app/Android.bp
index 8b42edb..83a857f 100644
--- a/hostsidetests/graphics/framerateoverride/app/Android.bp
+++ b/hostsidetests/graphics/framerateoverride/app/Android.bp
@@ -38,7 +38,7 @@
"mockito-target-minus-junit4",
"SurfaceFlingerProperties",
"testng",
- "truth-prebuilt",
+ "truth",
],
// Tag this module as a cts test artifact
diff --git a/hostsidetests/hdmicec/app/Android.bp b/hostsidetests/hdmicec/app/Android.bp
index 965746b..87c4262 100644
--- a/hostsidetests/hdmicec/app/Android.bp
+++ b/hostsidetests/hdmicec/app/Android.bp
@@ -27,7 +27,7 @@
"compatibility-device-util-axt",
"guava",
"services.core",
- "truth-prebuilt",
+ "truth",
],
min_sdk_version: "28",
}
diff --git a/hostsidetests/incident/apps/graphicsstatsapp/Android.bp b/hostsidetests/incident/apps/graphicsstatsapp/Android.bp
index d8d6b9b..8e032d9 100644
--- a/hostsidetests/incident/apps/graphicsstatsapp/Android.bp
+++ b/hostsidetests/incident/apps/graphicsstatsapp/Android.bp
@@ -28,7 +28,7 @@
"ctstestrunner-axt",
"compatibility-device-util-axt",
"androidx.legacy_legacy-support-v4",
- "truth-prebuilt",
+ "truth",
],
sdk_version: "test_current",
// tag this module as a cts test artifact
diff --git a/hostsidetests/input/app/Android.bp b/hostsidetests/input/app/Android.bp
index 4dc1aba..0a4153d 100644
--- a/hostsidetests/input/app/Android.bp
+++ b/hostsidetests/input/app/Android.bp
@@ -42,7 +42,7 @@
"androidx.test.rules",
"cts-input-lib",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
],
sdk_version: "test_current",
diff --git a/hostsidetests/install/Android.bp b/hostsidetests/install/Android.bp
index 150a760..8a3071a 100644
--- a/hostsidetests/install/Android.bp
+++ b/hostsidetests/install/Android.bp
@@ -19,13 +19,13 @@
java_test_host {
name: "CtsInstallHostTestCases",
defaults: ["cts_defaults"],
- srcs: ["src/**/*.java"],
+ srcs: ["src/**/*.java"],
libs: [
"compatibility-host-util",
"cts-tradefed",
"cts-shim-host-lib",
"tradefed",
- "truth-prebuilt",
+ "truth",
"hamcrest",
"hamcrest-library",
],
@@ -40,12 +40,15 @@
android_test_helper_app {
name: "InstallTest",
- srcs: ["app/src/**/*.java", "src/android/cts/install/*.java"],
- manifest : "app/AndroidManifest.xml",
+ srcs: [
+ "app/src/**/*.java",
+ "src/android/cts/install/*.java",
+ ],
+ manifest: "app/AndroidManifest.xml",
static_libs: [
"androidx.test.runner",
"androidx.test.core",
- "truth-prebuilt",
+ "truth",
"cts-install-lib",
"cts-rollback-lib",
],
diff --git a/hostsidetests/media/app/AudioTest/Android.bp b/hostsidetests/media/app/AudioTest/Android.bp
index 732b4c7..af42f34 100644
--- a/hostsidetests/media/app/AudioTest/Android.bp
+++ b/hostsidetests/media/app/AudioTest/Android.bp
@@ -32,7 +32,7 @@
],
static_libs: [
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
"androidx.test.ext.junit",
],
}
diff --git a/hostsidetests/media/app/MediaMetricsTest/Android.bp b/hostsidetests/media/app/MediaMetricsTest/Android.bp
index 7798523..a2b9c42 100644
--- a/hostsidetests/media/app/MediaMetricsTest/Android.bp
+++ b/hostsidetests/media/app/MediaMetricsTest/Android.bp
@@ -56,7 +56,7 @@
"collector-device-lib",
"compatibility-device-util-axt",
"cts-midi-lib",
- "truth-prebuilt",
+ "truth",
],
sdk_version: "test_current",
min_sdk_version: "30",
diff --git a/hostsidetests/memunreachable/Android.bp b/hostsidetests/memunreachable/Android.bp
index 1eb1f50..240feb6 100644
--- a/hostsidetests/memunreachable/Android.bp
+++ b/hostsidetests/memunreachable/Android.bp
@@ -24,7 +24,7 @@
"cts-tradefed",
"tradefed",
"compatibility-host-util",
- "truth-host-prebuilt",
+ "truth",
],
static_libs: [
"compatibility-host-util-axt",
diff --git a/hostsidetests/multiuser/app/Android.bp b/hostsidetests/multiuser/app/Android.bp
index 4143486..fdaab65 100644
--- a/hostsidetests/multiuser/app/Android.bp
+++ b/hostsidetests/multiuser/app/Android.bp
@@ -21,7 +21,8 @@
defaults: ["cts_defaults"],
static_libs: [
"androidx.test.rules",
- "truth-prebuilt",],
+ "truth",
+ ],
srcs: ["src/**/*.java"],
sdk_version: "test_current",
}
diff --git a/hostsidetests/os/Android.bp b/hostsidetests/os/Android.bp
index f8eb126..8841d5b 100644
--- a/hostsidetests/os/Android.bp
+++ b/hostsidetests/os/Android.bp
@@ -25,7 +25,7 @@
"cts-tradefed",
"tradefed",
"compatibility-host-util",
- "truth-host-prebuilt",
+ "truth",
],
static_libs: [
"compatibility-host-util-axt",
diff --git a/hostsidetests/packagemanager/domainverification/apps/calling/Android.bp b/hostsidetests/packagemanager/domainverification/apps/calling/Android.bp
index b688fcf..480bb77 100644
--- a/hostsidetests/packagemanager/domainverification/apps/calling/Android.bp
+++ b/hostsidetests/packagemanager/domainverification/apps/calling/Android.bp
@@ -18,7 +18,7 @@
android_test_helper_app {
name: "CtsDomainVerificationTestCallingApp",
- srcs: [ "src/**/*.kt" ],
+ srcs: ["src/**/*.kt"],
defaults: ["cts_defaults"],
sdk_version: "test_current",
static_libs: [
@@ -29,6 +29,6 @@
"CtsDomainVerificationJavaConstantsLibrary",
"junit",
"kotlin-reflect",
- "truth-prebuilt",
- ]
+ "truth",
+ ],
}
diff --git a/hostsidetests/packagemanager/domainverification/apps/declaring/Android.bp b/hostsidetests/packagemanager/domainverification/apps/declaring/Android.bp
index 94d712f..fa0e164 100644
--- a/hostsidetests/packagemanager/domainverification/apps/declaring/Android.bp
+++ b/hostsidetests/packagemanager/domainverification/apps/declaring/Android.bp
@@ -25,7 +25,7 @@
"CtsDomainVerificationAndroidConstantsLibrary",
"CtsDomainVerificationJavaConstantsLibrary",
"junit",
- "truth-prebuilt",
+ "truth",
],
}
diff --git a/hostsidetests/packagemanager/domainverification/device/multiuser/Android.bp b/hostsidetests/packagemanager/domainverification/device/multiuser/Android.bp
index f2054a7..cb3795c 100644
--- a/hostsidetests/packagemanager/domainverification/device/multiuser/Android.bp
+++ b/hostsidetests/packagemanager/domainverification/device/multiuser/Android.bp
@@ -18,7 +18,7 @@
android_test {
name: "CtsDomainVerificationDeviceMultiUserTestCases",
- srcs: [ "src/**/*.kt" ],
+ srcs: ["src/**/*.kt"],
test_suites: [
"cts",
"device-tests",
@@ -34,7 +34,7 @@
"Harrier",
"junit",
"Nene",
- "truth-prebuilt",
+ "truth",
],
java_resources: [
":CtsDomainVerificationTestDeclaringApp1",
diff --git a/hostsidetests/packagemanager/domainverification/device/standalone/Android.bp b/hostsidetests/packagemanager/domainverification/device/standalone/Android.bp
index f90e7ed..3796eaa 100644
--- a/hostsidetests/packagemanager/domainverification/device/standalone/Android.bp
+++ b/hostsidetests/packagemanager/domainverification/device/standalone/Android.bp
@@ -18,7 +18,7 @@
android_test {
name: "CtsDomainVerificationDeviceStandaloneTestCases",
- srcs: [ "src/**/*.kt" ],
+ srcs: ["src/**/*.kt"],
test_suites: [
"cts",
"device-tests",
@@ -34,7 +34,7 @@
"CtsDomainVerificationAndroidConstantsLibrary",
"CtsDomainVerificationJavaConstantsLibrary",
"junit",
- "truth-prebuilt",
+ "truth",
],
data: [
":CtsDomainVerificationTestDeclaringApp1",
diff --git a/hostsidetests/packagemanager/domainverification/lib/constants/android/Android.bp b/hostsidetests/packagemanager/domainverification/lib/constants/android/Android.bp
index 874d299..1545eec 100644
--- a/hostsidetests/packagemanager/domainverification/lib/constants/android/Android.bp
+++ b/hostsidetests/packagemanager/domainverification/lib/constants/android/Android.bp
@@ -28,6 +28,6 @@
"CtsDomainVerificationJavaConstantsLibrary",
"junit",
"kotlin-reflect",
- "truth-prebuilt",
+ "truth",
],
}
diff --git a/hostsidetests/packagemanager/dynamicmime/Android.bp b/hostsidetests/packagemanager/dynamicmime/Android.bp
index 46b8e7e..fe71761 100644
--- a/hostsidetests/packagemanager/dynamicmime/Android.bp
+++ b/hostsidetests/packagemanager/dynamicmime/Android.bp
@@ -28,7 +28,7 @@
"cts-tradefed",
"tradefed",
"compatibility-host-util",
- "truth-prebuilt",
+ "truth",
],
data: [
":CtsDynamicMimeUpdateAppFirstGroup",
diff --git a/hostsidetests/rollback/Android.bp b/hostsidetests/rollback/Android.bp
index 04e264d..390f90b 100644
--- a/hostsidetests/rollback/Android.bp
+++ b/hostsidetests/rollback/Android.bp
@@ -20,18 +20,33 @@
name: "CtsRollbackManagerHostTestCases",
defaults: ["cts_defaults"],
srcs: ["src/**/*.java"],
- libs: ["cts-tradefed", "cts-shim-host-lib", "tradefed", "truth-prebuilt"],
+ libs: [
+ "cts-tradefed",
+ "cts-shim-host-lib",
+ "tradefed",
+ "truth",
+ ],
static_libs: ["cts-install-lib-host"],
- data: [":CtsRollbackManagerHostTestHelperApp", ":CtsRollbackManagerHostTestHelperApp2"],
- test_suites: ["cts", "general-tests"],
+ data: [
+ ":CtsRollbackManagerHostTestHelperApp",
+ ":CtsRollbackManagerHostTestHelperApp2",
+ ],
+ test_suites: [
+ "cts",
+ "general-tests",
+ ],
}
android_test_helper_app {
name: "CtsRollbackManagerHostTestHelperApp",
- srcs: ["app/src/**/*.java"],
- static_libs: ["androidx.test.rules", "cts-rollback-lib", "cts-install-lib"],
- manifest : "app/AndroidManifest.xml",
- java_resources: [
+ srcs: ["app/src/**/*.java"],
+ static_libs: [
+ "androidx.test.rules",
+ "cts-rollback-lib",
+ "cts-install-lib",
+ ],
+ manifest: "app/AndroidManifest.xml",
+ java_resources: [
":ApexKeyRotationTestV2_SignedBobRotRollback",
],
sdk_version: "test_current",
@@ -40,9 +55,13 @@
android_test_helper_app {
name: "CtsRollbackManagerHostTestHelperApp2",
- srcs: ["app2/src/**/*.java"],
- static_libs: ["androidx.test.rules", "cts-rollback-lib", "cts-install-lib"],
- manifest : "app2/AndroidManifest.xml",
+ srcs: ["app2/src/**/*.java"],
+ static_libs: [
+ "androidx.test.rules",
+ "cts-rollback-lib",
+ "cts-install-lib",
+ ],
+ manifest: "app2/AndroidManifest.xml",
sdk_version: "test_current",
test_suites: ["device-tests"],
}
diff --git a/hostsidetests/scopedstorage/Android.bp b/hostsidetests/scopedstorage/Android.bp
index a919d1b..ea53e73 100644
--- a/hostsidetests/scopedstorage/Android.bp
+++ b/hostsidetests/scopedstorage/Android.bp
@@ -210,7 +210,7 @@
manifest: "AndroidManifest.xml",
srcs: ["src/**/*.java"],
static_libs: [
- "truth-prebuilt",
+ "truth",
"cts-scopedstorage-lib",
"modules-utils-build_system",
],
@@ -236,7 +236,7 @@
manifest: "AndroidManifest.xml",
srcs: ["src/**/*.java"],
static_libs: [
- "truth-prebuilt",
+ "truth",
"cts-scopedstorage-lib",
"modules-utils-build_system",
],
@@ -258,7 +258,7 @@
manifest: "legacy/AndroidManifest.xml",
srcs: ["legacy/src/**/*.java"],
static_libs: [
- "truth-prebuilt",
+ "truth",
"cts-scopedstorage-lib",
],
compile_multilib: "both",
@@ -449,7 +449,7 @@
test_config: "device/AndroidTest.xml",
srcs: ["device/**/*.java"],
static_libs: [
- "truth-prebuilt",
+ "truth",
"cts-scopedstorage-lib",
"androidx.test.uiautomator_uiautomator",
"modules-utils-build_system",
diff --git a/hostsidetests/security/app/Android.bp b/hostsidetests/security/app/Android.bp
index c63be73..6ff4fbc 100644
--- a/hostsidetests/security/app/Android.bp
+++ b/hostsidetests/security/app/Android.bp
@@ -28,7 +28,7 @@
],
static_libs: [
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
"mockito-target-minus-junit4",
],
diff --git a/hostsidetests/settings/Android.bp b/hostsidetests/settings/Android.bp
index 0b5bd4a..9b06db8 100644
--- a/hostsidetests/settings/Android.bp
+++ b/hostsidetests/settings/Android.bp
@@ -26,7 +26,7 @@
"tradefed",
"compatibility-host-util",
"guava",
- "truth-prebuilt",
+ "truth",
],
// tag this module as a cts test artifact
test_suites: [
diff --git a/hostsidetests/settings/app/DeviceOwnerApp/Android.bp b/hostsidetests/settings/app/DeviceOwnerApp/Android.bp
index 90c799c..11c1524 100644
--- a/hostsidetests/settings/app/DeviceOwnerApp/Android.bp
+++ b/hostsidetests/settings/app/DeviceOwnerApp/Android.bp
@@ -36,7 +36,7 @@
"compatibility-device-util-axt",
"androidx.test.rules",
"androidx.test.uiautomator_uiautomator",
- "truth-prebuilt",
+ "truth",
"cts-wm-util",
"DpmWrapper",
],
diff --git a/hostsidetests/signedconfig/hostside/Android.bp b/hostsidetests/signedconfig/hostside/Android.bp
index db3e84f..3ec4ed4 100644
--- a/hostsidetests/signedconfig/hostside/Android.bp
+++ b/hostsidetests/signedconfig/hostside/Android.bp
@@ -26,7 +26,7 @@
"tradefed",
"compatibility-host-util",
"guava",
- "truth-prebuilt",
+ "truth",
],
static_libs: ["hamcrest-library"],
test_suites: [
diff --git a/hostsidetests/silentupdate/testapp/Android.bp b/hostsidetests/silentupdate/testapp/Android.bp
index c4c019e..84b3a56 100644
--- a/hostsidetests/silentupdate/testapp/Android.bp
+++ b/hostsidetests/silentupdate/testapp/Android.bp
@@ -29,7 +29,7 @@
"androidx.annotation_annotation",
"androidx.core_core",
"androidx.test.runner",
- "truth-prebuilt",
+ "truth",
"TestApp",
"Nene",
],
diff --git a/hostsidetests/stagedinstall/Android.bp b/hostsidetests/stagedinstall/Android.bp
index 5052c5b..c437d70 100644
--- a/hostsidetests/stagedinstall/Android.bp
+++ b/hostsidetests/stagedinstall/Android.bp
@@ -27,7 +27,7 @@
"cts-tradefed",
"cts-shim-host-lib",
"tradefed",
- "truth-prebuilt",
+ "truth",
"hamcrest",
"hamcrest-library",
],
@@ -76,7 +76,7 @@
static_libs: [
"androidx.test.runner",
"androidx.test.core",
- "truth-prebuilt",
+ "truth",
"cts-install-lib",
],
sdk_version: "test_current",
diff --git a/hostsidetests/statsdatom/Android.bp b/hostsidetests/statsdatom/Android.bp
index 837c4ea..1e824b1 100644
--- a/hostsidetests/statsdatom/Android.bp
+++ b/hostsidetests/statsdatom/Android.bp
@@ -73,7 +73,7 @@
"cts-tradefed",
"host-libprotobuf-java-full",
"tradefed",
- "truth-prebuilt",
+ "truth",
],
static_libs: [
@@ -107,6 +107,6 @@
"compatibility-host-util",
"cts-tradefed",
"tradefed",
- "truth-prebuilt",
+ "truth",
],
}
diff --git a/hostsidetests/telephony/devicetest/Android.bp b/hostsidetests/telephony/devicetest/Android.bp
index dda0d6c..c554d91 100644
--- a/hostsidetests/telephony/devicetest/Android.bp
+++ b/hostsidetests/telephony/devicetest/Android.bp
@@ -29,7 +29,7 @@
static_libs: [
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
],
// Tag this module as a cts test artifact
diff --git a/hostsidetests/telephonyprovider/devicetest/Android.bp b/hostsidetests/telephonyprovider/devicetest/Android.bp
index cc44044..ad0ca2c 100644
--- a/hostsidetests/telephonyprovider/devicetest/Android.bp
+++ b/hostsidetests/telephonyprovider/devicetest/Android.bp
@@ -28,7 +28,7 @@
],
static_libs: [
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
],
// Tag this module as a cts test artifact
diff --git a/libs/helpers/core/tests/Android.bp b/libs/helpers/core/tests/Android.bp
index 8816bb6..e34549b 100644
--- a/libs/helpers/core/tests/Android.bp
+++ b/libs/helpers/core/tests/Android.bp
@@ -29,7 +29,7 @@
"cts-helpers-core",
"guava",
"mockito-target",
- "truth-prebuilt",
+ "truth",
],
sdk_version: "test_current",
diff --git a/libs/install/Android.bp b/libs/install/Android.bp
index f7fdc8b..edf55a6 100644
--- a/libs/install/Android.bp
+++ b/libs/install/Android.bp
@@ -12,7 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
@@ -38,7 +37,7 @@
manifest: "testapp/Av1.xml",
srcs: ["testapp/src/**/*.java"],
resource_dirs: ["testapp/res_v1"],
- apex_available: [ "com.android.apex.apkrollback.test_v1" ],
+ apex_available: ["com.android.apex.apkrollback.test_v1"],
min_sdk_version: "28",
target_sdk_version: "28",
}
@@ -48,7 +47,7 @@
manifest: "testapp/Av2.xml",
srcs: ["testapp/src/**/*.java"],
resource_dirs: ["testapp/res_v2"],
- apex_available: [ "com.android.apex.apkrollback.test_v2" ],
+ apex_available: ["com.android.apex.apkrollback.test_v2"],
min_sdk_version: "28",
target_sdk_version: "28",
}
@@ -68,7 +67,7 @@
sdk_version: "current",
srcs: ["testapp/src/**/*.java"],
resource_dirs: ["testapp/res_v2"],
- apex_available: [ "com.android.apex.apkrollback.test_v2Crashing" ],
+ apex_available: ["com.android.apex.apkrollback.test_v2Crashing"],
}
android_test_helper_app {
@@ -141,7 +140,7 @@
srcs: ["testapp/src/**/*.java"],
resource_dirs: ["testapp/res_v1"],
certificate: ":cts-ec-p256",
- apex_available: [ "com.android.apex.apkrollback.test_v1" ],
+ apex_available: ["com.android.apex.apkrollback.test_v1"],
}
android_test_helper_app {
@@ -153,7 +152,7 @@
certificate: ":cts-ec-p256",
additional_certificates: [":cts-ec-p256_2"],
lineage: "testapp/signing/ec-p256-por-1_2",
- apex_available: [ "com.android.apex.apkrollback.test_v2" ],
+ apex_available: ["com.android.apex.apkrollback.test_v2"],
}
android_test_helper_app {
@@ -162,7 +161,7 @@
sdk_version: "current",
srcs: ["testapp/src/**/*.java"],
resource_dirs: ["testapp/res_v2"],
- apex_available: [ "com.android.apex.apkrollback.test_v2" ],
+ apex_available: ["com.android.apex.apkrollback.test_v2"],
}
android_test_helper_app {
@@ -189,7 +188,7 @@
"compatibility-device-util-axt",
"cts-shim-lib",
"modules-utils-build",
- "truth-prebuilt"
+ "truth",
],
sdk_version: "test_current",
java_resources: [
@@ -229,5 +228,8 @@
java_library_host {
name: "cts-install-lib-host",
srcs: ["src/**/host/InstallUtilsHost.java"],
- libs: ["tradefed", "cts-shim-host-lib",],
+ libs: [
+ "tradefed",
+ "cts-shim-host-lib",
+ ],
}
diff --git a/libs/rollback/Android.bp b/libs/rollback/Android.bp
index 80eda46..c1ac57c 100644
--- a/libs/rollback/Android.bp
+++ b/libs/rollback/Android.bp
@@ -19,6 +19,10 @@
java_library {
name: "cts-rollback-lib",
srcs: ["src/**/*.java"],
- static_libs: ["androidx.test.rules", "truth-prebuilt", "cts-install-lib"],
+ static_libs: [
+ "androidx.test.rules",
+ "truth",
+ "cts-install-lib",
+ ],
sdk_version: "test_current",
}
diff --git a/tests/BlobStore/Android.bp b/tests/BlobStore/Android.bp
index 4462040..2931c91 100644
--- a/tests/BlobStore/Android.bp
+++ b/tests/BlobStore/Android.bp
@@ -24,7 +24,7 @@
"androidx.test.rules",
"compatibility-device-util-axt",
"guava",
- "truth-prebuilt",
+ "truth",
"testng",
"BlobStoreTestUtils",
],
@@ -50,18 +50,18 @@
defaults: ["cts_defaults"],
static_libs: [
"androidx.test.ext.junit",
- "truth-prebuilt",
+ "truth",
"BlobStoreTestUtils",
],
srcs: [
"helper-app/src/**/*.java",
- ":CtsBlobStoreTestsAidl"
+ ":CtsBlobStoreTestsAidl",
],
test_suites: [
- "general-tests"
+ "general-tests",
],
manifest: "helper-app/AndroidManifest.xml",
- sdk_version: "test_current"
+ sdk_version: "test_current",
}
android_test_helper_app {
@@ -69,12 +69,12 @@
defaults: ["cts_defaults"],
static_libs: [
"androidx.test.ext.junit",
- "truth-prebuilt",
+ "truth",
"BlobStoreTestUtils",
],
srcs: [
"helper-app/src/**/*.java",
- ":CtsBlobStoreTestsAidl"
+ ":CtsBlobStoreTestsAidl",
],
test_suites: [
"general-tests",
@@ -84,7 +84,7 @@
"--rename-manifest-package com.android.cts.blob.helper2",
],
certificate: ":cts-blob-helper-cert",
- sdk_version: "test_current"
+ sdk_version: "test_current",
}
android_test_helper_app {
@@ -92,12 +92,12 @@
defaults: ["cts_defaults"],
static_libs: [
"androidx.test.ext.junit",
- "truth-prebuilt",
+ "truth",
"BlobStoreTestUtils",
],
srcs: [
"helper-app/src/**/*.java",
- ":CtsBlobStoreTestsAidl"
+ ":CtsBlobStoreTestsAidl",
],
test_suites: [
"general-tests",
@@ -107,12 +107,12 @@
"--rename-manifest-package com.android.cts.blob.helper3",
],
certificate: ":cts-blob-helper-cert2",
- sdk_version: "test_current"
+ sdk_version: "test_current",
}
filegroup {
name: "CtsBlobStoreTestsAidl",
srcs: [
"aidl/**/*.aidl",
- ]
+ ],
}
diff --git a/tests/MediaProviderTranscode/Android.bp b/tests/MediaProviderTranscode/Android.bp
index cbf6fe2..25afd5c 100644
--- a/tests/MediaProviderTranscode/Android.bp
+++ b/tests/MediaProviderTranscode/Android.bp
@@ -28,13 +28,16 @@
"cts-install-lib",
"collector-device-lib-platform",
"mockito-target",
- "truth-prebuilt",
+ "truth",
],
min_sdk_version: "30",
target_sdk_version: "33",
certificate: "media",
- java_resources: [":CtsTranscodeTestAppSupportsHevc", ":CtsTranscodeTestAppSupportsSlowMotion"]
+ java_resources: [
+ ":CtsTranscodeTestAppSupportsHevc",
+ ":CtsTranscodeTestAppSupportsSlowMotion",
+ ],
}
android_test_helper_app {
@@ -43,8 +46,8 @@
sdk_version: "test_current",
resource_dirs: ["helper/res-hevc"],
srcs: [
- "helper/src/**/*.java",
- "src/android/mediaprovidertranscode/cts/TranscodeTestConstants.java"
+ "helper/src/**/*.java",
+ "src/android/mediaprovidertranscode/cts/TranscodeTestConstants.java",
],
static_libs: ["androidx.legacy_legacy-support-v4"],
target_sdk_version: "28",
@@ -57,8 +60,8 @@
sdk_version: "test_current",
resource_dirs: ["helper/res-slow-motion"],
srcs: [
- "helper/src/**/*.java",
- "src/android/mediaprovidertranscode/cts/TranscodeTestConstants.java"
+ "helper/src/**/*.java",
+ "src/android/mediaprovidertranscode/cts/TranscodeTestConstants.java",
],
static_libs: ["androidx.legacy_legacy-support-v4"],
target_sdk_version: "28",
diff --git a/tests/admin/Android.bp b/tests/admin/Android.bp
index bbfb534..dc5bee6 100644
--- a/tests/admin/Android.bp
+++ b/tests/admin/Android.bp
@@ -23,7 +23,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"mockito-target-minus-junit4",
- "truth-prebuilt",
+ "truth",
"testng",
"Nene",
],
diff --git a/tests/app/BroadcastsTest/Android.bp b/tests/app/BroadcastsTest/Android.bp
index 2fc54b1..0a817d2 100644
--- a/tests/app/BroadcastsTest/Android.bp
+++ b/tests/app/BroadcastsTest/Android.bp
@@ -24,7 +24,7 @@
"androidx.test.rules",
"compatibility-device-util-axt",
"guava",
- "truth-prebuilt",
+ "truth",
"testng",
],
srcs: [
@@ -48,7 +48,7 @@
defaults: ["cts_defaults"],
static_libs: [
"androidx.test.ext.junit",
- "truth-prebuilt",
+ "truth",
],
srcs: [
"helper-app/src/**/*.java",
@@ -66,7 +66,7 @@
defaults: ["cts_defaults"],
static_libs: [
"androidx.test.ext.junit",
- "truth-prebuilt",
+ "truth",
],
srcs: [
"helper-app/src/**/*.java",
diff --git a/tests/app/ShortFgsTest/Android.bp b/tests/app/ShortFgsTest/Android.bp
index b227db0..dc0587e 100644
--- a/tests/app/ShortFgsTest/Android.bp
+++ b/tests/app/ShortFgsTest/Android.bp
@@ -22,7 +22,7 @@
libs: [
"android.test.runner",
"android.test.base",
- "truth-prebuilt",
+ "truth",
],
static_libs: [
"androidx.test.rules",
diff --git a/tests/apppredictionservice/Android.bp b/tests/apppredictionservice/Android.bp
index e8b9c68..3a89dec 100644
--- a/tests/apppredictionservice/Android.bp
+++ b/tests/apppredictionservice/Android.bp
@@ -23,7 +23,7 @@
"androidx.annotation_annotation",
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
],
srcs: ["src/**/*.java"],
// Tag this module as a cts test artifact
diff --git a/tests/atv/SettingsAPI/Android.bp b/tests/atv/SettingsAPI/Android.bp
index 04c7c48..2e6b56b 100644
--- a/tests/atv/SettingsAPI/Android.bp
+++ b/tests/atv/SettingsAPI/Android.bp
@@ -28,8 +28,8 @@
static_libs: [
"androidx.test.rules",
"compatibility-device-util-axt",
- "truth-prebuilt",
- "TvSettingsAPI"
+ "truth",
+ "TvSettingsAPI",
],
libs: [
"android.test.runner",
@@ -44,4 +44,3 @@
sdk_version: "test_current",
min_sdk_version: "31",
}
-
diff --git a/tests/autofillservice/Android.bp b/tests/autofillservice/Android.bp
index 17786d9..bfdbfea 100644
--- a/tests/autofillservice/Android.bp
+++ b/tests/autofillservice/Android.bp
@@ -26,7 +26,7 @@
"compatibility-device-util-axt",
"ctsdeviceutillegacy-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
"androidx.test.uiautomator_uiautomator",
"CtsMockInputMethodLib",
// TODO: remove once Android migrates to JUnit 4.12,
diff --git a/tests/camera/Android.bp b/tests/camera/Android.bp
index c6120df..4693d95 100644
--- a/tests/camera/Android.bp
+++ b/tests/camera/Android.bp
@@ -25,7 +25,7 @@
"ctstestrunner-axt",
"mockito-target-minus-junit4",
"CtsCameraUtils",
- "truth-prebuilt",
+ "truth",
"androidx.test.rules",
],
@@ -62,7 +62,7 @@
"mockito-target-minus-junit4",
"android-ex-camera2",
"CtsCameraUtils",
- "truth-prebuilt",
+ "truth",
"androidx.heifwriter_heifwriter",
"androidx.test.rules",
"MediaPerformanceClassCommon",
diff --git a/tests/contentcaptureservice/Android.bp b/tests/contentcaptureservice/Android.bp
index 91b37bf..e8dc116 100644
--- a/tests/contentcaptureservice/Android.bp
+++ b/tests/contentcaptureservice/Android.bp
@@ -24,7 +24,7 @@
"androidx.test.ext.junit",
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
// TODO: remove once Android migrates to JUnit 4.12,
// which provides assertThrows
"testng",
diff --git a/tests/contentsuggestions/Android.bp b/tests/contentsuggestions/Android.bp
index 4f55874..baa241d 100644
--- a/tests/contentsuggestions/Android.bp
+++ b/tests/contentsuggestions/Android.bp
@@ -23,7 +23,7 @@
"androidx.annotation_annotation",
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
// TODO: remove once Android migrates to JUnit 4.12,
// which provides assertThrows
"testng",
diff --git a/tests/credentials/Android.bp b/tests/credentials/Android.bp
index 6385739..4ea4ead 100644
--- a/tests/credentials/Android.bp
+++ b/tests/credentials/Android.bp
@@ -37,7 +37,7 @@
"testng",
"ctstestrunner-axt",
"cts-net-utils",
- "truth-prebuilt",
+ "truth",
"androidx.test.ext.junit",
"EventLib",
"ActivityContext",
@@ -46,7 +46,7 @@
"TestApp",
"MetricsRecorder",
"statsdprotolite",
- "Interactive"
+ "Interactive",
],
libs: [
"android.test.base",
diff --git a/tests/devicepolicy/Android.bp b/tests/devicepolicy/Android.bp
index e670409..5f308468 100644
--- a/tests/devicepolicy/Android.bp
+++ b/tests/devicepolicy/Android.bp
@@ -25,7 +25,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"cts-net-utils",
- "truth-prebuilt",
+ "truth",
"androidx.test.ext.junit",
"testng", // used for assertThrows
// TODO: Remove this once we remove ui automator usage
@@ -55,7 +55,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"cts-net-utils",
- "truth-prebuilt",
+ "truth",
"androidx.test.ext.junit",
"testng", // used for assertThrows
// TODO: Remove this once we remove ui automator usage
diff --git a/tests/devicepolicy/telephony/Android.bp b/tests/devicepolicy/telephony/Android.bp
index 9a45404..eeb0ea7 100644
--- a/tests/devicepolicy/telephony/Android.bp
+++ b/tests/devicepolicy/telephony/Android.bp
@@ -25,7 +25,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"cts-net-utils",
- "truth-prebuilt",
+ "truth",
"androidx.test.ext.junit",
"testng", // used for assertThrows
// TODO: Remove this once we remove ui automator usage
diff --git a/tests/framework/base/windowmanager/Android.bp b/tests/framework/base/windowmanager/Android.bp
index c1da877..9e66d69 100644
--- a/tests/framework/base/windowmanager/Android.bp
+++ b/tests/framework/base/windowmanager/Android.bp
@@ -65,7 +65,7 @@
"CtsMockInputMethodLib",
"CtsAccessibilityCommon",
"metrics-helper-lib",
- "truth-prebuilt",
+ "truth",
"cts-wm-overlayapp-base",
"cts-wm-shared",
"platform-compat-test-rules",
diff --git a/tests/location/location_coarse/Android.bp b/tests/location/location_coarse/Android.bp
index da18247..05d0cc6 100644
--- a/tests/location/location_coarse/Android.bp
+++ b/tests/location/location_coarse/Android.bp
@@ -26,7 +26,7 @@
"androidx.test.rules",
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
],
libs: [
"android.test.base",
diff --git a/tests/location/location_fine/Android.bp b/tests/location/location_fine/Android.bp
index 127df86..bc4a8bb 100644
--- a/tests/location/location_fine/Android.bp
+++ b/tests/location/location_fine/Android.bp
@@ -26,7 +26,7 @@
"androidx.test.rules",
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
],
libs: [
"android.test.base",
diff --git a/tests/location/location_gnss/Android.bp b/tests/location/location_gnss/Android.bp
index 97fb815..ab10bb6 100644
--- a/tests/location/location_gnss/Android.bp
+++ b/tests/location/location_gnss/Android.bp
@@ -30,14 +30,15 @@
"platform-test-annotations",
],
proto: {
- type: "nano",
- },
- srcs: [
- "src/**/*.java",
- "protos/**/*.proto",
- ],
- sdk_version: "test_current",
+ type: "nano",
+ },
+ srcs: [
+ "src/**/*.java",
+ "protos/**/*.proto",
+ ],
+ sdk_version: "test_current",
}
+
android_test {
name: "CtsLocationGnssTestCases",
defaults: ["cts_defaults"],
@@ -48,7 +49,7 @@
"androidx.test.rules",
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
"apache-commons-math",
],
libs: [
diff --git a/tests/location/location_none/Android.bp b/tests/location/location_none/Android.bp
index da0f4ed..f736f05 100644
--- a/tests/location/location_none/Android.bp
+++ b/tests/location/location_none/Android.bp
@@ -29,7 +29,7 @@
"mockito-target-minus-junit4",
// TODO: remove once Android migrates to JUnit 4.12, which provides assertThrows:
"testng",
- "truth-prebuilt",
+ "truth",
],
libs: [
"android.test.base",
diff --git a/tests/location/location_privileged/Android.bp b/tests/location/location_privileged/Android.bp
index d595366..97a833a 100644
--- a/tests/location/location_privileged/Android.bp
+++ b/tests/location/location_privileged/Android.bp
@@ -26,7 +26,7 @@
"androidx.test.rules",
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
],
libs: [
"android.test.base",
diff --git a/tests/musicrecognition/Android.bp b/tests/musicrecognition/Android.bp
index ecda10b..21e5e1d 100644
--- a/tests/musicrecognition/Android.bp
+++ b/tests/musicrecognition/Android.bp
@@ -23,7 +23,7 @@
"androidx.annotation_annotation",
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
],
srcs: ["src/**/*.java"],
// Tag this module as a cts test artifact
diff --git a/tests/process/Android.bp b/tests/process/Android.bp
index 0fd56de..bf435a4 100644
--- a/tests/process/Android.bp
+++ b/tests/process/Android.bp
@@ -26,7 +26,7 @@
"androidx.test.rules",
"compatibility-device-util-axt",
"guava",
- "truth-prebuilt",
+ "truth",
"testng",
],
libs: ["android.test.base"],
diff --git a/tests/searchui/Android.bp b/tests/searchui/Android.bp
index 80a8613..128ce50 100644
--- a/tests/searchui/Android.bp
+++ b/tests/searchui/Android.bp
@@ -24,7 +24,7 @@
"androidx.test.ext.junit",
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
"testng",
],
srcs: ["src/**/*.java"],
diff --git a/tests/security/Android.bp b/tests/security/Android.bp
index 018598d..d7e8657 100644
--- a/tests/security/Android.bp
+++ b/tests/security/Android.bp
@@ -23,7 +23,7 @@
"bouncycastle-bcpkix-unbundled",
"cbor-java",
"guava",
- "truth-prebuilt",
+ "truth",
"testng",
],
srcs: ["src/**/*.java"],
diff --git a/tests/sensor/sensorratepermission/Android.bp b/tests/sensor/sensorratepermission/Android.bp
index 98cd5cc..d22b475 100644
--- a/tests/sensor/sensorratepermission/Android.bp
+++ b/tests/sensor/sensorratepermission/Android.bp
@@ -34,7 +34,7 @@
static_libs: [
"ctstestrunner-axt",
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
"androidx.annotation_annotation",
"cts-sensors-tests",
],
diff --git a/tests/sensor/sensorratepermission/DebuggableAPI31/Android.bp b/tests/sensor/sensorratepermission/DebuggableAPI31/Android.bp
index 07228ec..9533b50 100644
--- a/tests/sensor/sensorratepermission/DebuggableAPI31/Android.bp
+++ b/tests/sensor/sensorratepermission/DebuggableAPI31/Android.bp
@@ -36,7 +36,7 @@
static_libs: [
"ctstestrunner-axt",
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
"androidx.annotation_annotation",
"cts-sensors-tests",
],
diff --git a/tests/sensor/sensorratepermission/DirectReportAPI30/Android.bp b/tests/sensor/sensorratepermission/DirectReportAPI30/Android.bp
index fd1fad3..f9fbbac 100644
--- a/tests/sensor/sensorratepermission/DirectReportAPI30/Android.bp
+++ b/tests/sensor/sensorratepermission/DirectReportAPI30/Android.bp
@@ -36,7 +36,7 @@
static_libs: [
"ctstestrunner-axt",
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
"androidx.annotation_annotation",
"cts-sensors-tests",
],
diff --git a/tests/sensor/sensorratepermission/DirectReportAPI31/Android.bp b/tests/sensor/sensorratepermission/DirectReportAPI31/Android.bp
index 8741687..2c725e8 100644
--- a/tests/sensor/sensorratepermission/DirectReportAPI31/Android.bp
+++ b/tests/sensor/sensorratepermission/DirectReportAPI31/Android.bp
@@ -36,7 +36,7 @@
static_libs: [
"ctstestrunner-axt",
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
"androidx.annotation_annotation",
"cts-sensors-tests",
],
diff --git a/tests/sensor/sensorratepermission/EventConnectionAPI30/Android.bp b/tests/sensor/sensorratepermission/EventConnectionAPI30/Android.bp
index 6e91699..f8f0d04 100644
--- a/tests/sensor/sensorratepermission/EventConnectionAPI30/Android.bp
+++ b/tests/sensor/sensorratepermission/EventConnectionAPI30/Android.bp
@@ -36,7 +36,7 @@
static_libs: [
"ctstestrunner-axt",
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
"androidx.annotation_annotation",
"cts-sensors-tests",
],
diff --git a/tests/sensor/sensorratepermission/EventConnectionAPI31/Android.bp b/tests/sensor/sensorratepermission/EventConnectionAPI31/Android.bp
index 3c1f950..b8e3dcd 100644
--- a/tests/sensor/sensorratepermission/EventConnectionAPI31/Android.bp
+++ b/tests/sensor/sensorratepermission/EventConnectionAPI31/Android.bp
@@ -36,7 +36,7 @@
static_libs: [
"ctstestrunner-axt",
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
"androidx.annotation_annotation",
"cts-sensors-tests",
],
diff --git a/tests/sensor/sensorratepermission/ReturnedRateInfo/Android.bp b/tests/sensor/sensorratepermission/ReturnedRateInfo/Android.bp
index bc4906b..5d0c039 100644
--- a/tests/sensor/sensorratepermission/ReturnedRateInfo/Android.bp
+++ b/tests/sensor/sensorratepermission/ReturnedRateInfo/Android.bp
@@ -36,7 +36,7 @@
static_libs: [
"ctstestrunner-axt",
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
"androidx.annotation_annotation",
"cts-sensors-tests",
],
diff --git a/tests/smartspace/Android.bp b/tests/smartspace/Android.bp
index a72c6cd..1135137 100644
--- a/tests/smartspace/Android.bp
+++ b/tests/smartspace/Android.bp
@@ -23,7 +23,7 @@
"androidx.annotation_annotation",
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
],
srcs: ["src/**/*.java"],
// Tag this module as a cts test artifact
diff --git a/tests/surfacecontrol/Android.bp b/tests/surfacecontrol/Android.bp
index 23fdae8..4774d08 100644
--- a/tests/surfacecontrol/Android.bp
+++ b/tests/surfacecontrol/Android.bp
@@ -45,7 +45,7 @@
"mockito-target-minus-junit4",
"platform-test-annotations",
"ub-uiautomator",
- "truth-prebuilt",
+ "truth",
"CtsSurfaceValidatorLib",
"cts-wm-util",
],
diff --git a/tests/tests/activityrecognition/Android.bp b/tests/tests/activityrecognition/Android.bp
index 8982ade..e81d9ae 100644
--- a/tests/tests/activityrecognition/Android.bp
+++ b/tests/tests/activityrecognition/Android.bp
@@ -26,7 +26,7 @@
],
static_libs: [
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
"ctstestrunner-axt",
"platform-test-annotations",
],
diff --git a/tests/tests/appop/Android.bp b/tests/tests/appop/Android.bp
index 748e344..0a37a18 100644
--- a/tests/tests/appop/Android.bp
+++ b/tests/tests/appop/Android.bp
@@ -73,7 +73,7 @@
"compatibility-device-util-axt",
"androidx.legacy_legacy-support-v4",
"platform-test-annotations",
- "truth-prebuilt",
+ "truth",
"androidx.test.uiautomator_uiautomator",
],
diff --git a/tests/tests/appop/AppThatUsesAppOps/Android.bp b/tests/tests/appop/AppThatUsesAppOps/Android.bp
index 3212fd9..6fe4cd9 100644
--- a/tests/tests/appop/AppThatUsesAppOps/Android.bp
+++ b/tests/tests/appop/AppThatUsesAppOps/Android.bp
@@ -16,29 +16,29 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-cc_test_library {
+cc_test_library {
name: "libAppThatUsesAppOps_jni",
sdk_version: "current",
stl: "c++_static",
srcs: [
- "jni/**/*.cpp"
+ "jni/**/*.cpp",
],
cflags: [
"-Wall",
"-Werror",
- "-Wno-unused-parameter"
+ "-Wno-unused-parameter",
],
shared_libs: [
"liblog",
- "libbinder_ndk"
+ "libbinder_ndk",
],
static_libs: [
- "AppOpsUserServiceAidlNative-ndk"
- ]
+ "AppOpsUserServiceAidlNative-ndk",
+ ],
}
android_test_helper_app {
@@ -51,17 +51,17 @@
static_libs: [
"appops-test-util-lib",
"AppOpsUserServiceAidl",
- "truth-prebuilt",
+ "truth",
"junit",
],
jni_libs: [
- "libAppThatUsesAppOps_jni"
+ "libAppThatUsesAppOps_jni",
],
test_suites: [
"cts",
"general-tests",
"mts",
- ]
+ ],
}
diff --git a/tests/tests/appop2/Android.bp b/tests/tests/appop2/Android.bp
index 55a30b9..3a3512f 100644
--- a/tests/tests/appop2/Android.bp
+++ b/tests/tests/appop2/Android.bp
@@ -26,7 +26,7 @@
"androidx.test.rules",
"compatibility-device-util-axt",
"platform-test-annotations",
- "truth-prebuilt",
+ "truth",
],
test_suites: [
diff --git a/tests/tests/attributionsource/Android.bp b/tests/tests/attributionsource/Android.bp
index ea09ec5..6762344 100644
--- a/tests/tests/attributionsource/Android.bp
+++ b/tests/tests/attributionsource/Android.bp
@@ -27,7 +27,7 @@
static_libs: [
"androidx.test.core",
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
"ctstestrunner-axt",
"platform-test-annotations",
],
diff --git a/tests/tests/batteryhealth/Android.bp b/tests/tests/batteryhealth/Android.bp
index d017e57..da77613 100644
--- a/tests/tests/batteryhealth/Android.bp
+++ b/tests/tests/batteryhealth/Android.bp
@@ -26,7 +26,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"platformprotosnano",
- "truth-prebuilt",
+ "truth",
"ub-uiautomator",
],
libs: [
diff --git a/tests/tests/batterysaving/Android.bp b/tests/tests/batterysaving/Android.bp
index 2f30175..f7152e9 100644
--- a/tests/tests/batterysaving/Android.bp
+++ b/tests/tests/batterysaving/Android.bp
@@ -27,7 +27,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"platformprotosnano",
- "truth-prebuilt",
+ "truth",
"androidx.test.uiautomator_uiautomator",
],
libs: [
diff --git a/tests/tests/calendarprovider/Android.bp b/tests/tests/calendarprovider/Android.bp
index d14e9f1..f32abe8 100644
--- a/tests/tests/calendarprovider/Android.bp
+++ b/tests/tests/calendarprovider/Android.bp
@@ -21,7 +21,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"junit",
- "truth-prebuilt",
+ "truth",
"mockito-target-minus-junit4",
],
diff --git a/tests/tests/car/Android.bp b/tests/tests/car/Android.bp
index 326fa98..81a0389b 100644
--- a/tests/tests/car/Android.bp
+++ b/tests/tests/car/Android.bp
@@ -26,7 +26,7 @@
"androidx.test.rules",
"android-support-v4",
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
"ctstestrunner-axt",
"libprotobuf-java-lite",
"framework-annotations-lib",
diff --git a/tests/tests/car_builtin/apps/SimpleApp/Android.bp b/tests/tests/car_builtin/apps/SimpleApp/Android.bp
index 2f500b7..3f13dd9 100644
--- a/tests/tests/car_builtin/apps/SimpleApp/Android.bp
+++ b/tests/tests/car_builtin/apps/SimpleApp/Android.bp
@@ -31,7 +31,7 @@
],
static_libs: [
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
"ctstestrunner-axt",
],
libs: [
diff --git a/tests/tests/carrierapi/Android.bp b/tests/tests/carrierapi/Android.bp
index 11e83d5..326df3f 100644
--- a/tests/tests/carrierapi/Android.bp
+++ b/tests/tests/carrierapi/Android.bp
@@ -24,7 +24,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"junit",
- "truth-prebuilt",
+ "truth",
],
srcs: ["src/**/*.java"],
sdk_version: "test_current",
diff --git a/tests/tests/carrierapi/targetprep/device/Android.bp b/tests/tests/carrierapi/targetprep/device/Android.bp
index 8d054b7..2928903 100644
--- a/tests/tests/carrierapi/targetprep/device/Android.bp
+++ b/tests/tests/carrierapi/targetprep/device/Android.bp
@@ -25,7 +25,7 @@
"androidx.test.runner",
"compatibility-device-util-axt",
"junit",
- "truth-prebuilt",
+ "truth",
],
libs: [],
// Tag this module as a cts test artifact
diff --git a/tests/tests/contactsprovider/Android.bp b/tests/tests/contactsprovider/Android.bp
index 4f9c030..72ee380 100644
--- a/tests/tests/contactsprovider/Android.bp
+++ b/tests/tests/contactsprovider/Android.bp
@@ -24,7 +24,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"junit",
- "truth-prebuilt",
+ "truth",
],
srcs: [
diff --git a/tests/tests/content/Android.bp b/tests/tests/content/Android.bp
index 714ebee..4477388 100644
--- a/tests/tests/content/Android.bp
+++ b/tests/tests/content/Android.bp
@@ -41,7 +41,7 @@
"ctstestrunner-axt",
"services.core",
"junit",
- "truth-prebuilt",
+ "truth",
"accountaccesslib",
// TODO: remove once Android migrates to JUnit 4.12, which provides assertThrows:
"testng",
diff --git a/tests/tests/content/HelloWorldApp/Android.bp b/tests/tests/content/HelloWorldApp/Android.bp
index 91dbcca..5b0c557 100644
--- a/tests/tests/content/HelloWorldApp/Android.bp
+++ b/tests/tests/content/HelloWorldApp/Android.bp
@@ -79,7 +79,7 @@
"hamcrest-library",
"junit",
"testng",
- "truth-prebuilt",
+ "truth",
],
srcs: ["src_res_hardening_lib/**/*.java"],
resource_dirs: [],
diff --git a/tests/tests/gamemanager/Android.bp b/tests/tests/gamemanager/Android.bp
index 1e90921..4c34af9 100644
--- a/tests/tests/gamemanager/Android.bp
+++ b/tests/tests/gamemanager/Android.bp
@@ -24,7 +24,7 @@
"ctstestserver",
"framework-annotations-lib",
"junit",
- "truth-prebuilt",
+ "truth",
],
data: [
diff --git a/tests/tests/gameservice/Android.bp b/tests/tests/gameservice/Android.bp
index 7ab01e0..3e62ac5 100644
--- a/tests/tests/gameservice/Android.bp
+++ b/tests/tests/gameservice/Android.bp
@@ -42,7 +42,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"junit",
- "truth-prebuilt",
+ "truth",
],
sdk_version: "test_current",
test_suites: [
diff --git a/tests/tests/hibernation/Android.bp b/tests/tests/hibernation/Android.bp
index 3bb187f..06f2978 100644
--- a/tests/tests/hibernation/Android.bp
+++ b/tests/tests/hibernation/Android.bp
@@ -31,7 +31,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"testng",
- "truth-prebuilt",
+ "truth",
"guava",
"junit",
"hamcrest-library",
diff --git a/tests/tests/instantapp/Android.bp b/tests/tests/instantapp/Android.bp
index 9f4da5b..1b17df1 100644
--- a/tests/tests/instantapp/Android.bp
+++ b/tests/tests/instantapp/Android.bp
@@ -20,7 +20,7 @@
android_test {
name: "CtsInstantAppTests",
- srcs: [ "src/**/*.kt" ],
+ srcs: ["src/**/*.kt"],
libs: [
"android.test.runner",
"android.test.base",
@@ -30,7 +30,7 @@
"androidx.test.ext.junit",
"androidx.test.rules",
"mockito-target-minus-junit4",
- "truth-prebuilt",
+ "truth",
],
test_suites: [
"cts",
diff --git a/tests/tests/media/bettertogether/Android.bp b/tests/tests/media/bettertogether/Android.bp
index 3c7a66b3..c87ca2b 100644
--- a/tests/tests/media/bettertogether/Android.bp
+++ b/tests/tests/media/bettertogether/Android.bp
@@ -24,7 +24,7 @@
"androidx.test.ext.truth",
"ctstestrunner-axt",
"cts-media-common",
- "truth-prebuilt",
+ "truth",
"Harrier",
],
resource_dirs: ["res"],
diff --git a/tests/tests/media/misc/Android.bp b/tests/tests/media/misc/Android.bp
index feaabe4..cc22363 100644
--- a/tests/tests/media/misc/Android.bp
+++ b/tests/tests/media/misc/Android.bp
@@ -65,7 +65,7 @@
"junit",
"junit-params",
"testng",
- "truth-prebuilt",
+ "truth",
"mockito-target-minus-junit4",
"androidx.heifwriter_heifwriter",
"CtsCameraUtils",
diff --git a/tests/tests/media/projection/Android.bp b/tests/tests/media/projection/Android.bp
index 584a319..bca976e 100644
--- a/tests/tests/media/projection/Android.bp
+++ b/tests/tests/media/projection/Android.bp
@@ -32,7 +32,7 @@
"junit",
"junit-params",
"testng",
- "truth-prebuilt",
+ "truth",
],
aaptflags: [
"--auto-add-overlay",
diff --git a/tests/tests/notificationlegacy/notificationlegacy30/Android.bp b/tests/tests/notificationlegacy/notificationlegacy30/Android.bp
index 232cfd9..6bc5481 100644
--- a/tests/tests/notificationlegacy/notificationlegacy30/Android.bp
+++ b/tests/tests/notificationlegacy/notificationlegacy30/Android.bp
@@ -24,7 +24,7 @@
"ctstestrunner-axt",
"CtsAppTestStubsShared",
"junit",
- "truth-prebuilt",
+ "truth",
],
libs: [
"android.test.runner",
@@ -38,7 +38,7 @@
test_suites: [
"cts",
"general-tests",
- "mts"
+ "mts",
],
sdk_version: "test_current",
target_sdk_version: "30",
diff --git a/tests/tests/os/Android.bp b/tests/tests/os/Android.bp
index b78514d..81d0c00 100644
--- a/tests/tests/os/Android.bp
+++ b/tests/tests/os/Android.bp
@@ -29,7 +29,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"testng",
- "truth-prebuilt",
+ "truth",
"guava",
"junit",
"Harrier",
diff --git a/tests/tests/packageinstaller/atomicinstall/Android.bp b/tests/tests/packageinstaller/atomicinstall/Android.bp
index add4a53..16292f7 100644
--- a/tests/tests/packageinstaller/atomicinstall/Android.bp
+++ b/tests/tests/packageinstaller/atomicinstall/Android.bp
@@ -19,17 +19,17 @@
android_test {
name: "CtsAtomicInstallTestCases",
- srcs: ["src/**/*.java"],
+ srcs: ["src/**/*.java"],
- java_resources: [
- ":AtomicInstallCorrupt"
+ java_resources: [
+ ":AtomicInstallCorrupt",
],
static_libs: [
"androidx.annotation_annotation",
"androidx.core_core",
"androidx.test.runner",
- "truth-prebuilt",
- "cts-install-lib",
+ "truth",
+ "cts-install-lib",
],
sdk_version: "test_current",
test_suites: [
@@ -42,5 +42,5 @@
filegroup {
name: "AtomicInstallCorrupt",
srcs: ["testdata/apk/prebuilt/corrupt.apk"],
- path: "testdata/apk/prebuilt"
+ path: "testdata/apk/prebuilt",
}
diff --git a/tests/tests/packageinstaller/contentprovider/Android.bp b/tests/tests/packageinstaller/contentprovider/Android.bp
index 711549a..4c7aff6 100644
--- a/tests/tests/packageinstaller/contentprovider/Android.bp
+++ b/tests/tests/packageinstaller/contentprovider/Android.bp
@@ -29,7 +29,7 @@
"androidx.test.runner",
"junit",
"kotlin-test",
- "truth-prebuilt",
+ "truth",
"androidx.test.uiautomator_uiautomator",
],
platform_apis: false,
@@ -58,7 +58,7 @@
"androidx.test.runner",
"junit",
"kotlin-test",
- "truth-prebuilt",
+ "truth",
"androidx.test.uiautomator_uiautomator",
],
platform_apis: false,
diff --git a/tests/tests/packageinstaller/install/Android.bp b/tests/tests/packageinstaller/install/Android.bp
index 82365b4..7b6a53b 100644
--- a/tests/tests/packageinstaller/install/Android.bp
+++ b/tests/tests/packageinstaller/install/Android.bp
@@ -33,7 +33,7 @@
"compatibility-device-util-axt",
"androidx.legacy_legacy-support-v4",
"platform-test-annotations",
- "truth-prebuilt",
+ "truth",
"cts-install-lib",
"kotlin-test",
"Nene",
diff --git a/tests/tests/packageinstaller/packagescheme/Android.bp b/tests/tests/packageinstaller/packagescheme/Android.bp
index 454d4cc8..c5cee92 100644
--- a/tests/tests/packageinstaller/packagescheme/Android.bp
+++ b/tests/tests/packageinstaller/packagescheme/Android.bp
@@ -29,7 +29,7 @@
"androidx.test.runner",
"junit",
"kotlin-test",
- "truth-prebuilt",
+ "truth",
"androidx.test.uiautomator_uiautomator",
],
platform_apis: true,
@@ -56,7 +56,7 @@
"androidx.test.runner",
"junit",
"kotlin-test",
- "truth-prebuilt",
+ "truth",
"androidx.test.uiautomator_uiautomator",
],
platform_apis: true,
diff --git a/tests/tests/packagewatchdog/Android.bp b/tests/tests/packagewatchdog/Android.bp
index 46ec52d..afaec9e 100644
--- a/tests/tests/packagewatchdog/Android.bp
+++ b/tests/tests/packagewatchdog/Android.bp
@@ -26,13 +26,13 @@
"cts",
"vts",
"general-tests",
- "mts-extservices"
+ "mts-extservices",
],
libs: ["android.test.base"],
static_libs: [
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
],
srcs: [
"src/**/*.java",
diff --git a/tests/tests/permission/Android.bp b/tests/tests/permission/Android.bp
index 5a907d7..26edc9d 100644
--- a/tests/tests/permission/Android.bp
+++ b/tests/tests/permission/Android.bp
@@ -38,7 +38,7 @@
"guava",
"android-ex-camera2",
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
"androidx.annotation_annotation",
"platformprotosnano",
"permission-test-util-lib",
diff --git a/tests/tests/permissionpolicy/Android.bp b/tests/tests/permissionpolicy/Android.bp
index 5a92e89..127de93 100644
--- a/tests/tests/permissionpolicy/Android.bp
+++ b/tests/tests/permissionpolicy/Android.bp
@@ -34,7 +34,7 @@
"ctstestrunner-axt",
"guava",
"androidx.test.ext.junit-nodeps",
- "truth-prebuilt",
+ "truth",
"permission-test-util-lib",
],
srcs: [
diff --git a/tests/tests/persistentdataservice/Android.bp b/tests/tests/persistentdataservice/Android.bp
index da98ce1..7fcda37 100644
--- a/tests/tests/persistentdataservice/Android.bp
+++ b/tests/tests/persistentdataservice/Android.bp
@@ -21,8 +21,8 @@
defaults: ["cts_defaults"],
static_libs: [
"ctstestrunner-axt",
- "Harrier",
- "truth-prebuilt"
+ "Harrier",
+ "truth",
],
libs: ["android.test.base"],
srcs: ["src/**/*.java"],
diff --git a/tests/tests/provider/Android.bp b/tests/tests/provider/Android.bp
index 285e3f5..09ae45d 100644
--- a/tests/tests/provider/Android.bp
+++ b/tests/tests/provider/Android.bp
@@ -1,4 +1,3 @@
-
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
@@ -28,7 +27,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"junit",
- "truth-prebuilt",
+ "truth",
"mockito-target-minus-junit4",
// TODO: remove testng once Android migrates to JUnit 4.12, which provides assertThrows
"testng",
@@ -43,7 +42,8 @@
srcs: [
"src/**/*.java",
"app/GalleryTestApp/src/**/*.java",
- "app/MultiAuthorityApp/src/**/*.java"],
+ "app/MultiAuthorityApp/src/**/*.java",
+ ],
// uncomment when b/140885436 is fixed
// sdk_version: "test_current",
@@ -54,7 +54,7 @@
data: [
":CtsProviderGalleryTestApp",
- ":CtsProviderMultiAuthorityApp"
+ ":CtsProviderMultiAuthorityApp",
],
host_required: ["compatibility-host-provider-preconditions"],
@@ -62,6 +62,8 @@
filegroup {
name: "CtsProviderTestUtils",
- srcs: ["src/android/provider/cts/ProviderTestUtils.java",
- "src/android/provider/cts/media/MediaStoreUtils.java"],
+ srcs: [
+ "src/android/provider/cts/ProviderTestUtils.java",
+ "src/android/provider/cts/media/MediaStoreUtils.java",
+ ],
}
diff --git a/tests/tests/resolverservice/Android.bp b/tests/tests/resolverservice/Android.bp
index b2187f8..780299d 100644
--- a/tests/tests/resolverservice/Android.bp
+++ b/tests/tests/resolverservice/Android.bp
@@ -21,17 +21,17 @@
sdk_version: "system_current",
srcs: [
- "src/**/*.java"
+ "src/**/*.java",
],
static_libs: [
"androidx.test.rules",
"ctstestrunner-axt",
- "truth-prebuilt"
+ "truth",
],
test_suites: [
"cts",
"general-tests",
- ]
+ ],
}
diff --git a/tests/tests/resourcesloader/Android.bp b/tests/tests/resourcesloader/Android.bp
index d220e0a..3c3e313 100644
--- a/tests/tests/resourcesloader/Android.bp
+++ b/tests/tests/resourcesloader/Android.bp
@@ -28,11 +28,11 @@
"general-tests",
],
srcs: [
- "src/**/*.kt"
+ "src/**/*.kt",
],
libs: [
"android.test.runner",
- "android.test.base"
+ "android.test.base",
],
static_libs: [
"CtsResourcesLoaderTests_Providers",
@@ -43,22 +43,25 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"mockito-target-minus-junit4",
- "truth-prebuilt"
+ "truth",
],
- resource_dirs: ["res", "resources/provider_stable/res"],
+ resource_dirs: [
+ "res",
+ "resources/provider_stable/res",
+ ],
aaptflags: ["-0 .txt"],
data: [
":CtsResourcesLoaderTests_ProviderOne_Split",
":CtsResourcesLoaderTests_ProviderTwo_Split",
":CtsResourcesLoaderTests_ProviderThree_Split",
- ":CtsResourcesLoaderTests_ProviderFour_Split"
- ]
+ ":CtsResourcesLoaderTests_ProviderFour_Split",
+ ],
}
java_genrule {
name: "CtsResourcesLoaderTests_Providers",
tools: ["soong_zip"],
- srcs : [
+ srcs: [
":CtsResourcesLoaderTests_ProviderOne",
":CtsResourcesLoaderTests_ProviderOne_ARSC",
":CtsResourcesLoaderTests_ProviderTwo",
@@ -66,10 +69,10 @@
":CtsResourcesLoaderTests_ProviderThree",
":CtsResourcesLoaderTests_ProviderThree_ARSC",
":CtsResourcesLoaderTests_ProviderFour",
- ":CtsResourcesLoaderTests_ProviderFour_ARSC"
+ ":CtsResourcesLoaderTests_ProviderFour_ARSC",
],
out: ["CtsResourcesLoaderTests_Providers.jar"],
cmd: "mkdir -p $(genDir)/assets/ && cp $(in) $(genDir)/assets/ && " +
- "$(location soong_zip) -o $(out) " +
- "-L 0 -C $(genDir) -D $(genDir)/assets/"
+ "$(location soong_zip) -o $(out) " +
+ "-L 0 -C $(genDir) -D $(genDir)/assets/",
}
diff --git a/tests/tests/role/Android.bp b/tests/tests/role/Android.bp
index ae1fdfd..10b9d2a 100644
--- a/tests/tests/role/Android.bp
+++ b/tests/tests/role/Android.bp
@@ -31,7 +31,7 @@
"androidx.test.rules",
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
],
test_suites: [
diff --git a/tests/tests/settings/Android.bp b/tests/tests/settings/Android.bp
index 2ad3660..ecd5637 100644
--- a/tests/tests/settings/Android.bp
+++ b/tests/tests/settings/Android.bp
@@ -21,7 +21,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"junit",
- "truth-prebuilt",
+ "truth",
],
srcs: ["src/**/*.java"],
diff --git a/tests/tests/simphonebookprovider/Android.bp b/tests/tests/simphonebookprovider/Android.bp
index 2aa2292..6f9fc97 100644
--- a/tests/tests/simphonebookprovider/Android.bp
+++ b/tests/tests/simphonebookprovider/Android.bp
@@ -19,7 +19,7 @@
"compatibility-device-util-axt",
"hamcrest-library",
"junit",
- "truth-prebuilt",
+ "truth",
],
visibility: [
@@ -27,7 +27,7 @@
],
srcs: [
- ":cts-simphonebook-rules-sources"
+ ":cts-simphonebook-rules-sources",
],
sdk_version: "test_current",
@@ -56,14 +56,14 @@
"hamcrest-library",
"junit",
"telephony-common-testing",
- "truth-prebuilt",
+ "truth",
],
srcs: [
"src/**/*.java",
],
exclude_srcs: [
- ":cts-simphonebook-rules-sources"
+ ":cts-simphonebook-rules-sources",
],
sdk_version: "test_current",
diff --git a/tests/tests/taskfpscallback/Android.bp b/tests/tests/taskfpscallback/Android.bp
index 8a89132..f4b6b32 100644
--- a/tests/tests/taskfpscallback/Android.bp
+++ b/tests/tests/taskfpscallback/Android.bp
@@ -37,7 +37,7 @@
"ctstestrunner-axt",
"ctstestserver",
"junit",
- "truth-prebuilt",
+ "truth",
],
srcs: ["src/**/*.java"],
diff --git a/tests/tests/telephony/current/Android.bp b/tests/tests/telephony/current/Android.bp
index d6f2647..8c24f87 100644
--- a/tests/tests/telephony/current/Android.bp
+++ b/tests/tests/telephony/current/Android.bp
@@ -55,7 +55,7 @@
"ctstestrunner-axt",
"hamcrest-library",
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
"android.telephony.mockmodem",
],
srcs: [
diff --git a/tests/tests/telephony4/Android.bp b/tests/tests/telephony4/Android.bp
index 8cd8a33..4dcc8ce 100644
--- a/tests/tests/telephony4/Android.bp
+++ b/tests/tests/telephony4/Android.bp
@@ -27,7 +27,7 @@
static_libs: [
"ctstestrunner-axt",
"compatibility-device-util-axt",
- "truth-prebuilt",
+ "truth",
],
srcs: ["src/**/*.java"],
platform_apis: true,
diff --git a/tests/tests/telephonyprovider/Android.bp b/tests/tests/telephonyprovider/Android.bp
index ca58247..22b4641 100644
--- a/tests/tests/telephonyprovider/Android.bp
+++ b/tests/tests/telephonyprovider/Android.bp
@@ -29,7 +29,7 @@
"compatibility-device-util-axt",
"androidx.test.rules",
"androidx.test.core",
- "truth-prebuilt",
+ "truth",
"telephony-cts-utils",
],
libs: [
diff --git a/tests/tests/textclassifier/Android.bp b/tests/tests/textclassifier/Android.bp
index bac5f6a..9d629ea 100644
--- a/tests/tests/textclassifier/Android.bp
+++ b/tests/tests/textclassifier/Android.bp
@@ -34,7 +34,7 @@
"androidx.test.rules",
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
"androidx.test.ext.junit",
"androidx.test.uiautomator_uiautomator",
],
diff --git a/tests/tests/uiautomation/Android.bp b/tests/tests/uiautomation/Android.bp
index 483a45f..3fce75f 100644
--- a/tests/tests/uiautomation/Android.bp
+++ b/tests/tests/uiautomation/Android.bp
@@ -28,7 +28,7 @@
"CtsAccessibilityCommon",
"CtsAccessibilityServiceUtils",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
"ub-uiautomator",
],
libs: ["android.test.base"],
diff --git a/tests/tests/view/Android.bp b/tests/tests/view/Android.bp
index a2d863b..0fdbe87 100644
--- a/tests/tests/view/Android.bp
+++ b/tests/tests/view/Android.bp
@@ -45,7 +45,7 @@
"mockito-target-minus-junit4",
"platform-test-annotations",
"ub-uiautomator",
- "truth-prebuilt",
+ "truth",
"CtsSurfaceValidatorLib",
"cts-wm-util",
],
diff --git a/tests/tests/view/receivecontent/Android.bp b/tests/tests/view/receivecontent/Android.bp
index a46c4b9..dfd4c87 100644
--- a/tests/tests/view/receivecontent/Android.bp
+++ b/tests/tests/view/receivecontent/Android.bp
@@ -32,7 +32,7 @@
"metrics-helper-lib",
"mockito-target-minus-junit4",
"platform-test-annotations",
- "truth-prebuilt",
+ "truth",
],
compile_multilib: "both",
srcs: ["src/**/*.java"],
diff --git a/tests/tests/voiceRecognition/Android.bp b/tests/tests/voiceRecognition/Android.bp
index e986121..45dcb98 100644
--- a/tests/tests/voiceRecognition/Android.bp
+++ b/tests/tests/voiceRecognition/Android.bp
@@ -29,7 +29,7 @@
"ctstestrunner-axt",
"compatibility-device-util-axt",
"androidx.test.ext.junit",
- "truth-prebuilt",
+ "truth",
"cts-wm-util",
"junit-params",
],
diff --git a/tests/tests/widget/Android.bp b/tests/tests/widget/Android.bp
index a349523..fa41c46 100644
--- a/tests/tests/widget/Android.bp
+++ b/tests/tests/widget/Android.bp
@@ -30,7 +30,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"platform-test-annotations",
- "truth-prebuilt",
+ "truth",
"CtsMockInputMethodLib",
"androidx.test.uiautomator_uiautomator",
"androidx.test.espresso.core",
diff --git a/tests/tests/widget29/Android.bp b/tests/tests/widget29/Android.bp
index 08945ca..a5e2c4ed3 100644
--- a/tests/tests/widget29/Android.bp
+++ b/tests/tests/widget29/Android.bp
@@ -29,7 +29,7 @@
"compatibility-device-util-axt",
"ctstestrunner-axt",
"platform-test-annotations",
- "truth-prebuilt",
+ "truth",
],
libs: ["android.test.runner"],
diff --git a/tests/tests/wifi/Android.bp b/tests/tests/wifi/Android.bp
index 2d25382..fa9f341 100644
--- a/tests/tests/wifi/Android.bp
+++ b/tests/tests/wifi/Android.bp
@@ -45,7 +45,7 @@
"junit",
"junit-params",
"net-utils-framework-common",
- "truth-prebuilt",
+ "truth",
],
test_suites: [
diff --git a/tests/translation/Android.bp b/tests/translation/Android.bp
index 5656e99..765c388 100644
--- a/tests/translation/Android.bp
+++ b/tests/translation/Android.bp
@@ -30,7 +30,7 @@
"androidx.test.rules",
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
"androidx.test.ext.junit",
"testng",
"androidx.test.uiautomator_uiautomator",
diff --git a/tests/wallpapereffectsgeneration/Android.bp b/tests/wallpapereffectsgeneration/Android.bp
index a3f3145..8b2340d 100644
--- a/tests/wallpapereffectsgeneration/Android.bp
+++ b/tests/wallpapereffectsgeneration/Android.bp
@@ -23,7 +23,7 @@
"androidx.annotation_annotation",
"compatibility-device-util-axt",
"ctstestrunner-axt",
- "truth-prebuilt",
+ "truth",
],
srcs: ["src/**/*.java"],
// Tag this module as a cts test artifact
