diff options
author | Krzysztof Kosiński <krzysio@google.com> | 2023-10-11 19:41:36 +0000 |
---|---|---|
committer | Krzysztof Kosiński <krzysio@google.com> | 2023-10-11 19:41:36 +0000 |
commit | 15e17e0119ad64cc0861b4dcaa0b5d1e94ec08eb (patch) | |
tree | 665eec0774f5fe178a5b31d247380dbfaccec413 | |
parent | e249035b89d0d8d56ae4fd363ed0ac3fbc33cc22 (diff) | |
download | Settings-15e17e0119ad64cc0861b4dcaa0b5d1e94ec08eb.tar.gz |
Clean up obsolete aliases for Truth.
Bug: 255714762
Test: presubmit
Change-Id: I8aab463c74d5e869d949a2b712886a9cc4d15709
Merged-In: I8aab463c74d5e869d949a2b712886a9cc4d15709
-rw-r--r-- | tests/anomaly-tester/Android.bp | 2 | ||||
-rw-r--r-- | tests/componenttests/Android.bp | 2 | ||||
-rw-r--r-- | tests/robotests/Android.bp | 11 | ||||
-rw-r--r-- | tests/uitests/Android.bp | 2 | ||||
-rw-r--r-- | tests/unit/Android.bp | 6 |
5 files changed, 13 insertions, 10 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 70c2fcaa3bf..3ac08427330 100644 --- a/tests/unit/Android.bp +++ b/tests/unit/Android.bp @@ -21,7 +21,7 @@ android_test { ], static_libs: [ - "androidx.arch.core_core-testing", + "androidx.arch.core_core-testing", "androidx.test.core", "androidx.test.rules", "androidx.test.espresso.core", @@ -32,7 +32,7 @@ android_test { "mockito-target-minus-junit4", "platform-test-annotations", "platform-test-rules", - "truth-prebuilt", + "truth", "androidx.test.uiautomator_uiautomator", "kotlinx_coroutines_test", // Don't add SettingsLib libraries here - you can use them directly as they are in the @@ -40,7 +40,7 @@ android_test { ], errorprone: { - javacflags: ["-Xep:CheckReturnValue:WARN"] + javacflags: ["-Xep:CheckReturnValue:WARN"], }, // Include all test java/kotlin files. |