Merge android14-tests-dev
Bug: 263910020
Merged-In: I83eccf007baba511b15fbde9327d3459d62adb51
Change-Id: I89303af3e5f49c14d903940124a7e898d8bbb7ae
diff --git a/tests/Android.bp b/tests/Android.bp
index 13d143a..ec43ed3 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -20,8 +20,16 @@
name: "CtsRebootReadinessTestCases",
manifest: "AndroidManifest.xml",
srcs: ["src/**/*.java"],
- static_libs: ["androidx.test.rules", "truth-prebuilt", "androidx.test.core"],
- test_suites: ["general-tests", "cts", "mts-scheduling"],
+ static_libs: [
+ "androidx.test.rules",
+ "truth",
+ "androidx.test.core",
+ ],
+ test_suites: [
+ "general-tests",
+ "cts",
+ "mts-scheduling",
+ ],
target_sdk_version: "31",
min_sdk_version: "31",
}
diff --git a/tests/hostsidetests/Android.bp b/tests/hostsidetests/Android.bp
index 6ed2def..c1e4c05 100644
--- a/tests/hostsidetests/Android.bp
+++ b/tests/hostsidetests/Android.bp
@@ -21,7 +21,7 @@
srcs: ["src/**/*.java"],
libs: [
"tradefed",
- "truth-prebuilt",
+ "truth",
],
data: [
":RebootReadinessTestApp",
diff --git a/tests/hostsidetests/testapp/Android.bp b/tests/hostsidetests/testapp/Android.bp
index 1aeb105..b485019 100644
--- a/tests/hostsidetests/testapp/Android.bp
+++ b/tests/hostsidetests/testapp/Android.bp
@@ -23,7 +23,7 @@
static_libs: [
"androidx.test.runner",
"androidx.test.core",
- "truth-prebuilt",
+ "truth",
],
min_sdk_version: "current",
sdk_version: "system_current",
diff --git a/tests/unittests/Android.bp b/tests/unittests/Android.bp
index 14b6884..78ea03b 100644
--- a/tests/unittests/Android.bp
+++ b/tests/unittests/Android.bp
@@ -25,7 +25,7 @@
"service-scheduling",
"androidx.test.runner",
"mockito-target-extended-minus-junit4",
- "truth-prebuilt",
+ "truth",
],
libs: [
"android.test.mock",
@@ -40,5 +40,8 @@
compile_multilib: "both",
target_sdk_version: "31",
min_sdk_version: "31",
- test_suites: ["general-tests", "mts-scheduling"],
+ test_suites: [
+ "general-tests",
+ "mts-scheduling",
+ ],
}
