diff options
| author | Krzysztof Kosiński <krzysio@google.com> | 2023-10-07 09:34:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-07 09:34:58 +0000 |
| commit | 97da6506d1fe5a543166f519d558e9a74450bcc9 (patch) | |
| tree | c731326c53cd880985a887235eb40247dd29cb83 | |
| parent | 962eed585d7c41783239a3cc9e4e8b207e7eb3c4 (diff) | |
| parent | dab56e630224b0e1843ec06edbd8de0c98b42871 (diff) | |
| download | ManagedProvisioning-97da6506d1fe5a543166f519d558e9a74450bcc9.tar.gz | |
Clean up obsolete aliases for Truth. am: a93d3e5521 am: 38b34b4f40 am: c0be29ce18 am: dab56e6302
Original change: https://android-review.googlesource.com/c/platform/packages/apps/ManagedProvisioning/+/2778095
Change-Id: Iae8ae95be154ede697878d2c03426cef5fc676d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/instrumentation/Android.bp | 22 | ||||
| -rw-r--r-- | tests/robotests/Android.bp | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/tests/instrumentation/Android.bp b/tests/instrumentation/Android.bp index a5d5b508a..d4ad84ac2 100644 --- a/tests/instrumentation/Android.bp +++ b/tests/instrumentation/Android.bp @@ -13,7 +13,7 @@ android_test { srcs: [ "src/**/*.java", - "src/**/*.kt" + "src/**/*.kt", ], platform_apis: true, @@ -25,7 +25,7 @@ android_test { "androidx.test.espresso.core", "androidx.test.espresso.contrib", "androidx.test.espresso.intents", - "truth-prebuilt", + "truth", "testng", // used only for assertThrows "ub-uiautomator", // used for unlocking the device "TestApp", @@ -39,24 +39,24 @@ android_test { } android_library { - name: "ManagedProvisioningTestsLib", - srcs: [ - "src/**/*.java", - "src/**/*.kt" - ], - manifest: "AndroidManifest.xml", - libs: [ + name: "ManagedProvisioningTestsLib", + srcs: [ + "src/**/*.java", + "src/**/*.kt", + ], + manifest: "AndroidManifest.xml", + libs: [ "android.test.runner", "android.test.base", "android.test.mock", ], - static_libs: [ + static_libs: [ "androidx.test.rules", "mockito-target-minus-junit4", "androidx.test.espresso.core", "androidx.test.espresso.contrib", "androidx.test.espresso.intents", - "truth-prebuilt", + "truth", "testng", "ub-uiautomator", "TestApp", diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp index dd0c2ed40..afc9de00c 100644 --- a/tests/robotests/Android.bp +++ b/tests/robotests/Android.bp @@ -11,7 +11,7 @@ android_robolectric_test { srcs: [ "src/**/*.java", - "src/**/*.kt" + "src/**/*.kt", ], java_resource_dirs: ["config"], @@ -21,7 +21,7 @@ android_robolectric_test { "robolectric_android-all-stub", "Robolectric_all-target", "mockito-robolectric-prebuilt", - "truth-prebuilt", + "truth", "androidx.test.core", "androidx.test.rules", "androidx.core_core", |