summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof KosiƄski <krzysio@google.com>2023-10-07 05:37:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-07 05:37:10 +0000
commitade6fbc4a3c16eeb435f8dd981a55924c572b164 (patch)
treeb8f4d687cf9e73ebaf19778adbef51901694b898
parentc47862e14baf87d40c0696332926bd1d4e0eee5f (diff)
parent2f700bd30d8fb98311a8f0727e99fc8724222161 (diff)
downloadservices-ade6fbc4a3c16eeb435f8dd981a55924c572b164.tar.gz
Clean up obsolete aliases for Truth. am: 7070159150 am: c757db2714 am: 1b67bd7fee am: 2bf93ac26d am: 2f700bd30d
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/services/+/2778088 Change-Id: I8e1f28ecd57f5b6ea0225350b1caf3a318016ce6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--builtInServices/host_tests/Android.bp2
-rw-r--r--builtInServices/tests/Android.bp4
-rw-r--r--updatableServices/tests/Android.bp2
3 files changed, 4 insertions, 4 deletions
diff --git a/builtInServices/host_tests/Android.bp b/builtInServices/host_tests/Android.bp
index 7b62799..8bf90e0 100644
--- a/builtInServices/host_tests/Android.bp
+++ b/builtInServices/host_tests/Android.bp
@@ -8,7 +8,7 @@ java_test_host {
libs: [
"junit",
"tradefed",
- "truth-prebuilt",
+ "truth",
],
static_libs: [
"compatibility-host-util",
diff --git a/builtInServices/tests/Android.bp b/builtInServices/tests/Android.bp
index ce8eb37..3d073fd 100644
--- a/builtInServices/tests/Android.bp
+++ b/builtInServices/tests/Android.bp
@@ -8,7 +8,7 @@ android_test {
name: "FrameworkOptCarServicesTest",
srcs: [
- "src/**/*.java"
+ "src/**/*.java",
],
platform_apis: true,
@@ -36,7 +36,7 @@ android_test {
"mockito-target-extended-minus-junit4",
"services.core",
"testng",
- "truth-prebuilt",
+ "truth",
"car-frameworks-service.impl",
],
diff --git a/updatableServices/tests/Android.bp b/updatableServices/tests/Android.bp
index 6322d8e..a25751f 100644
--- a/updatableServices/tests/Android.bp
+++ b/updatableServices/tests/Android.bp
@@ -38,7 +38,7 @@ android_test {
"mockito-target-extended-minus-junit4",
"services.core",
"testng",
- "truth-prebuilt",
+ "truth",
],
// mockito-target-extended dependencies