Clean up obsolete aliases for Truth. am: e3d27457c6 am: 834900858c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/2775236
Change-Id: I8f57e265fd45bc020b3b726b5a26a1173b46dbb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/backuprestore/tests/Android.bp b/backuprestore/tests/Android.bp
index 3a36b4d..4d2f2c0 100644
--- a/backuprestore/tests/Android.bp
+++ b/backuprestore/tests/Android.bp
@@ -28,7 +28,7 @@
],
test_suites: [
"mts-healthfitness",
- "general-tests"
+ "general-tests",
],
defaults: ["mts-target-sdk-version-current"],
static_libs: [
@@ -36,7 +36,7 @@
"androidx.test.core",
"androidx.test.runner",
"mockito-target-minus-junit4",
- "truth-prebuilt",
+ "truth",
],
libs: [
"android.test.base",
diff --git a/tests/cts/hostsidetests/healthconnect/Android.bp b/tests/cts/hostsidetests/healthconnect/Android.bp
index a7c868a..27c1bc1 100644
--- a/tests/cts/hostsidetests/healthconnect/Android.bp
+++ b/tests/cts/hostsidetests/healthconnect/Android.bp
@@ -23,14 +23,14 @@
platform_apis: true,
static_libs: [
"ctstestrunner-axt",
- "cts-healthconnect-lib"
+ "cts-healthconnect-lib",
],
sdk_version: "test_current",
min_sdk_version: "UpsideDownCake",
srcs: [
"HealthConnectTestHelper/src/**/*.java",
"HealthConnectTestHelper/src/**/*.kt",
- ],
+ ],
libs: ["junit"],
}
@@ -86,8 +86,8 @@
defaults: ["cts_defaults"],
srcs: [
"device/**/*.java",
- "device/**/*.kt"
- ],
+ "device/**/*.kt",
+ ],
static_libs: [
"cts-healthconnect-lib",
"modules-utils-build_system",
@@ -111,13 +111,13 @@
"android.test.runner",
"framework-healthfitness",
],
- data : [
- ":CtsHealthConnectTestAppAWithNormalReadWritePermission",
- ":CtsHealthConnectTestAppBWithNormalReadWritePermission",
- ":CtsHealthConnectTestAppWithDataManagePermission",
- ":CtsHealthConnectTestAppWithNoPermission",
- ":CtsHealthConnectTestAppWithWritePermissionsOnly",
- ]
+ data: [
+ ":CtsHealthConnectTestAppAWithNormalReadWritePermission",
+ ":CtsHealthConnectTestAppBWithNormalReadWritePermission",
+ ":CtsHealthConnectTestAppWithDataManagePermission",
+ ":CtsHealthConnectTestAppWithNoPermission",
+ ":CtsHealthConnectTestAppWithWritePermissionsOnly",
+ ],
}
java_test_host {
@@ -125,7 +125,7 @@
defaults: ["cts_defaults"],
srcs: [
"host/**/*.java",
- "host/**/*.kt"
+ "host/**/*.kt",
],
test_suites: [
"cts",
@@ -136,12 +136,12 @@
"compatibility-host-util",
"cts-tradefed",
"tradefed",
- "truth-prebuilt",
+ "truth",
],
static_libs: [
"cts-statsd-atom-host-test-utils",
],
data: [
":CtsHealthConnectTestApp",
- ]
+ ],
}
diff --git a/tests/unittests/Android.bp b/tests/unittests/Android.bp
index c733662..c50a34c 100644
--- a/tests/unittests/Android.bp
+++ b/tests/unittests/Android.bp
@@ -27,7 +27,7 @@
],
test_suites: [
"mts-healthfitness",
- "general-tests"
+ "general-tests",
],
defaults: ["mts-target-sdk-version-current"],
static_libs: [
@@ -35,7 +35,7 @@
"framework-healthfitness.impl",
"androidx.test.runner",
"mockito-target-extended-minus-junit4",
- "truth-prebuilt",
+ "truth",
"services.core",
"androidx.test.ext.truth",
],
@@ -54,4 +54,4 @@
// Test coverage system runs on different devices. Need to
// compile for all architecture.
compile_multilib: "both",
-}
\ No newline at end of file
+}