Merge "Clean up obsolete aliases for Truth." into main

core/tests/BroadcastRadioTests/Android.bp

@@ -38,7 +38,7 @@ android_test {
     static_libs: [
         "services.core",
         "androidx.test.rules",
-        "truth-prebuilt",
+        "truth",
         "testng",
         "mockito-target-extended",
     ],

core/tests/GameManagerTests/Android.bp

@@ -30,7 +30,7 @@ android_test {
         "frameworks-base-testutils",
         "junit",
         "platform-test-annotations",
-        "truth-prebuilt",
+        "truth",
     ],
     libs: ["android.test.runner"],
     platform_apis: true,

core/tests/PackageInstallerSessions/Android.bp

@@ -35,7 +35,7 @@ android_test {
         "frameworks-base-testutils",
         "platform-test-annotations",
         "testng",
-        "truth-prebuilt",
+        "truth",
     ],
 
     libs: [

core/tests/batterystatstests/BatteryUsageStatsProtoTests/Android.bp

@@ -18,7 +18,7 @@ android_test {
         "platform-test-annotations",
         "platformprotosnano",
         "statsdprotolite",
-        "truth-prebuilt",
+        "truth",
     ],
 
     libs: ["android.test.runner"],

core/tests/bugreports/Android.bp

@@ -32,7 +32,7 @@ android_test {
     static_libs: [
         "androidx.test.rules",
         "androidx.test.uiautomator_uiautomator",
-        "truth-prebuilt",
+        "truth",
     ],
     test_suites: ["general-tests"],
     sdk_version: "test_current",

core/tests/coretests/Android.bp

@@ -56,7 +56,7 @@ android_test {
         "ub-uiautomator",
         "platform-test-annotations",
         "platform-compat-test-rules",
-        "truth-prebuilt",
+        "truth",
         "print-test-util-lib",
         "testng",
         "servicestests-utils",
@@ -148,7 +148,7 @@ android_library {
         "androidx.test.runner",
         "androidx.test.rules",
         "mockito-target-minus-junit4",
-        "truth-prebuilt",
+        "truth",
     ],
 
     libs: [

core/tests/hdmitests/Android.bp

@@ -30,7 +30,7 @@ android_test {
         "frameworks-base-testutils",
         "guava-android-testlib",
         "platform-test-annotations",
-        "truth-prebuilt",
+        "truth",
     ],
     libs: ["android.test.runner"],
     platform_apis: true,

core/tests/mockingcoretests/Android.bp

@@ -38,7 +38,7 @@ android_test {
         "androidx.test.ext.junit",
         "mockito-target-extended-minus-junit4",
         "platform-test-annotations",
-        "truth-prebuilt",
+        "truth",
         "testables",
         "ub-uiautomator",
     ],

core/tests/nfctests/Android.bp

@@ -27,7 +27,7 @@ android_test {
         "androidx.test.ext.junit",
         "androidx.test.rules",
         "mockito-target-minus-junit4",
-        "truth-prebuilt",
+        "truth",
     ],
     libs: [
         "android.test.runner",

core/tests/overlaytests/device_self_targeting/Android.bp

@@ -30,7 +30,7 @@ android_test {
         "androidx.test.runner",
         "androidx.test.ext.junit",
         "mockito-target-minus-junit4",
-        "truth-prebuilt",
+        "truth",
     ],
 
     optimize: {

core/tests/privacytests/Android.bp

@@ -14,7 +14,7 @@ android_test {
         "junit",
         "rappor-tests",
         "androidx.test.rules",
-        "truth-prebuilt",
+        "truth",
     ],
     libs: ["android.test.runner"],
     platform_apis: true,

core/tests/utiltests/Android.bp

@@ -33,7 +33,7 @@ android_test {
         "frameworks-base-testutils",
         "mockito-target-minus-junit4",
         "androidx.test.ext.junit",
-        "truth-prebuilt",
+        "truth",
         "servicestests-utils",
     ],
 

errorprone/Android.bp

@@ -39,7 +39,7 @@ java_test_host {
     java_resource_dirs: ["tests/res"],
     java_resources: [":error_prone_android_framework_testdata"],
     static_libs: [
-        "truth-prebuilt",
+        "truth",
         "kxml2-2.3.0",
         "compile-testing-prebuilt",
         "error_prone_android_framework_lib",

libs/WindowManager/Jetpack/tests/unittest/Android.bp

@@ -37,7 +37,7 @@ android_test {
         "androidx.test.rules",
         "androidx.test.ext.junit",
         "mockito-target-extended-minus-junit4",
-        "truth-prebuilt",
+        "truth",
         "testables",
         "platform-test-annotations",
     ],

libs/WindowManager/Shell/tests/flicker/Android.bp

@@ -43,7 +43,7 @@ android_test {
         "flickerlib",
         "flickerlib-apphelpers",
         "flickerlib-helpers",
-        "truth-prebuilt",
+        "truth",
         "app-helpers-core",
         "launcher-helper-lib",
         "launcher-aosp-tapl",

libs/WindowManager/Shell/tests/unittest/Android.bp

@@ -44,7 +44,7 @@ android_test {
         "kotlinx-coroutines-android",
         "kotlinx-coroutines-core",
         "mockito-target-extended-minus-junit4",
-        "truth-prebuilt",
+        "truth",
         "testables",
         "platform-test-annotations",
         "servicestests-utils",

libs/dream/lowlight/tests/Android.bp

@@ -33,7 +33,7 @@ android_test {
         "mockito-target-extended-minus-junit4",
         "platform-test-annotations",
         "testables",
-        "truth-prebuilt",
+        "truth",
     ],
     libs: [
         "android.test.mock",

libs/securebox/tests/Android.bp

@@ -32,7 +32,7 @@ android_test {
         "platform-test-annotations",
         "testables",
         "testng",
-        "truth-prebuilt",
+        "truth",
     ],
     libs: [
         "android.test.mock",

media/tests/MediaRouter/Android.bp

@@ -24,7 +24,7 @@ android_test {
         "compatibility-device-util-axt",
         "mockito-target-minus-junit4",
         "testng",
-        "truth-prebuilt",
+        "truth",
     ],
     test_suites: ["general-tests"],
     platform_apis: true,

media/tests/projection/Android.bp

@@ -30,7 +30,7 @@ android_test {
         "platform-test-annotations",
         "testng",
         "testables",
-        "truth-prebuilt",
+        "truth",
         "platform-compat-test-rules",
     ],