From 665b151f8795876fa1a902b4171ea8ee30ddf757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= <krzysio@google.com>
Date: Sat, 7 Oct 2023 00:48:11 +0000
Subject: [PATCH] Clean up obsolete aliases for Truth.

Bug: 255714762
Test: presubmit
Change-Id: I8aab463c74d5e869d949a2b712886a9cc4d15709
Merged-In: I8aab463c74d5e869d949a2b712886a9cc4d15709
---
 tests/anomaly-tester/Android.bp |  2 +-
 tests/componenttests/Android.bp |  2 +-
 tests/robotests/Android.bp      | 11 +++++++----
 tests/uitests/Android.bp        |  2 +-
 tests/unit/Android.bp           |  4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/tests/anomaly-tester/Android.bp b/tests/anomaly-tester/Android.bp
index f17f4b275a4..0b05e04ffac 100644
--- a/tests/anomaly-tester/Android.bp
+++ b/tests/anomaly-tester/Android.bp
@@ -18,7 +18,7 @@ android_test {
         "androidx.test.rules",
         "mockito-target",
         "androidx.test.uiautomator_uiautomator",
-        "truth-prebuilt",
+        "truth",
     ],
 
     srcs: ["**/*.java"],
diff --git a/tests/componenttests/Android.bp b/tests/componenttests/Android.bp
index 5c03aa97fb3..300a338bd50 100644
--- a/tests/componenttests/Android.bp
+++ b/tests/componenttests/Android.bp
@@ -19,7 +19,7 @@ android_test {
     ],
 
     static_libs: [
-        "truth-prebuilt",
+        "truth",
         "androidx.test.core",
         "androidx.test.espresso.core",
         "androidx.test.espresso.intents-nodeps",
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index 94febfffb70..ad8361e2086 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -1,4 +1,4 @@
-    //############################################################
+//############################################################
 // Build SettingsRoboTestStub.apk which includes test-only resources.#
 //############################################################
 
@@ -47,7 +47,7 @@ android_app {
         "jsr305",
         "settings-contextual-card-protos-lite",
         "settings-log-bridge-protos-lite",
-	"settings-telephony-protos-lite",
+        "settings-telephony-protos-lite",
         "contextualcards",
         "settings-logtags",
         "zxing-core-1.7",
@@ -90,7 +90,10 @@ android_robolectric_test {
         "ims-common",
     ],
 
-    java_resource_dirs: ["config", "resources"],
+    java_resource_dirs: [
+        "config",
+        "resources",
+    ],
 
     instrumentation_for: "SettingsRoboTestStub",
 
@@ -114,6 +117,6 @@ java_library {
         "Settings-core",
         "Robolectric_all-target",
         "mockito-robolectric-prebuilt",
-        "truth-prebuilt",
+        "truth",
     ],
 }
diff --git a/tests/uitests/Android.bp b/tests/uitests/Android.bp
index d4f09a30178..5e83dbcd22c 100644
--- a/tests/uitests/Android.bp
+++ b/tests/uitests/Android.bp
@@ -43,7 +43,7 @@ android_test {
         "settings-helper",
         "sysui-helper",
         "timeresult-helper-lib",
-        "truth-prebuilt",
+        "truth",
     ],
 
     //sdk_version: "current",
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 8e812189bed..e0dd0781432 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -30,14 +30,14 @@ android_test {
         "androidx.preference_preference",
         "mockito-target-minus-junit4",
         "platform-test-annotations",
-        "truth-prebuilt",
+        "truth",
         "androidx.test.uiautomator_uiautomator",
         // Don't add SettingsLib libraries here - you can use them directly as they are in the
         // instrumented Settings app.
     ],
 
     errorprone: {
-        javacflags: ["-Xep:CheckReturnValue:WARN"]
+        javacflags: ["-Xep:CheckReturnValue:WARN"],
     },
 
     // Include all test java files.