commit 23c571ff2b8d9eb55b3e0643c01e66aaba467aeb
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Oct 12 01:43:51 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 12 01:43:51 2023 +0000
tree 06fcde7768a669f3cba524473f5059c4a9fc0e25
parent 15c5cd247838dc0670ea3e6490676be9d461269b
parent 409a6b24921e931186e1229a356a663895cd2460

Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d am: b06310a63f am: 409a6b2492

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829

Change-Id: I8873863c35e54bc92f5aae982fe159a5e5e46438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/anomaly-tester/Android.bp

diff --git a/tests/anomaly-tester/Android.bp b/tests/anomaly-tester/Android.bp
index f17f4b2..0b05e04 100644
--- a/tests/anomaly-tester/Android.bp
+++ b/tests/anomaly-tester/Android.bp
@@ -18,7 +18,7 @@
         "androidx.test.rules",
         "mockito-target",
         "androidx.test.uiautomator_uiautomator",
-        "truth-prebuilt",
+        "truth",
     ],
 
     srcs: ["**/*.java"],

tests/componenttests/Android.bp

diff --git a/tests/componenttests/Android.bp b/tests/componenttests/Android.bp
index 5c03aa9..300a338 100644
--- a/tests/componenttests/Android.bp
+++ b/tests/componenttests/Android.bp
@@ -19,7 +19,7 @@
     ],
 
     static_libs: [
-        "truth-prebuilt",
+        "truth",
         "androidx.test.core",
         "androidx.test.espresso.core",
         "androidx.test.espresso.intents-nodeps",

tests/robotests/Android.bp

diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index 94febff..ad8361e 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 @@
         "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 @@
         "ims-common",
     ],
 
-    java_resource_dirs: ["config", "resources"],
+    java_resource_dirs: [
+        "config",
+        "resources",
+    ],
 
     instrumentation_for: "SettingsRoboTestStub",
 
@@ -114,6 +117,6 @@
         "Settings-core",
         "Robolectric_all-target",
         "mockito-robolectric-prebuilt",
-        "truth-prebuilt",
+        "truth",
     ],
 }

tests/uitests/Android.bp

diff --git a/tests/uitests/Android.bp b/tests/uitests/Android.bp
index d4f09a3..5e83dbc 100644
--- a/tests/uitests/Android.bp
+++ b/tests/uitests/Android.bp
@@ -43,7 +43,7 @@
         "settings-helper",
         "sysui-helper",
         "timeresult-helper-lib",
-        "truth-prebuilt",
+        "truth",
     ],
 
     //sdk_version: "current",

tests/unit/Android.bp

diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 8e81218..e0dd078 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -30,14 +30,14 @@
         "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.