diff options
author | Krzysztof Kosiński <krzysio@google.com> | 2023-10-07 00:48:13 +0000 |
---|---|---|
committer | Krzysztof Kosiński <krzysio@google.com> | 2023-10-11 19:44:28 +0000 |
commit | e3d27457c67d815cbc0ac2c0b0aab7198088a85d (patch) | |
tree | e5d693bea7189ce2d3f59a7372c5122c19831481 | |
parent | 49c9784aafb79e83d89b31d7b8620ebadf693018 (diff) | |
download | HealthFitness-e3d27457c67d815cbc0ac2c0b0aab7198088a85d.tar.gz |
Clean up obsolete aliases for Truth.
Bug: 255714762
Test: presubmit
Change-Id: Ifc36eb49d3aae006c7e30f45b04b0dbbe21b74e3
Merged-In: Ifc36eb49d3aae006c7e30f45b04b0dbbe21b74e3
-rw-r--r-- | backuprestore/tests/Android.bp | 4 | ||||
-rw-r--r-- | tests/cts/hostsidetests/healthconnect/Android.bp | 28 | ||||
-rw-r--r-- | tests/unittests/Android.bp | 6 |
3 files changed, 19 insertions, 19 deletions
diff --git a/backuprestore/tests/Android.bp b/backuprestore/tests/Android.bp index 3a36b4dd..4d2f2c09 100644 --- a/backuprestore/tests/Android.bp +++ b/backuprestore/tests/Android.bp @@ -28,7 +28,7 @@ android_test { ], test_suites: [ "mts-healthfitness", - "general-tests" + "general-tests", ], defaults: ["mts-target-sdk-version-current"], static_libs: [ @@ -36,7 +36,7 @@ android_test { "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 a7c868ad..27c1bc17 100644 --- a/tests/cts/hostsidetests/healthconnect/Android.bp +++ b/tests/cts/hostsidetests/healthconnect/Android.bp @@ -23,14 +23,14 @@ android_test_helper_app { 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 @@ android_test { 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 { "android.test.runner", "framework-healthfitness", ], - data : [ - ":CtsHealthConnectTestAppAWithNormalReadWritePermission", - ":CtsHealthConnectTestAppBWithNormalReadWritePermission", - ":CtsHealthConnectTestAppWithDataManagePermission", - ":CtsHealthConnectTestAppWithNoPermission", - ":CtsHealthConnectTestAppWithWritePermissionsOnly", - ] + data: [ + ":CtsHealthConnectTestAppAWithNormalReadWritePermission", + ":CtsHealthConnectTestAppBWithNormalReadWritePermission", + ":CtsHealthConnectTestAppWithDataManagePermission", + ":CtsHealthConnectTestAppWithNoPermission", + ":CtsHealthConnectTestAppWithWritePermissionsOnly", + ], } java_test_host { @@ -125,7 +125,7 @@ java_test_host { defaults: ["cts_defaults"], srcs: [ "host/**/*.java", - "host/**/*.kt" + "host/**/*.kt", ], test_suites: [ "cts", @@ -136,12 +136,12 @@ java_test_host { "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 c7336628..c50a34cf 100644 --- a/tests/unittests/Android.bp +++ b/tests/unittests/Android.bp @@ -27,7 +27,7 @@ android_test { ], test_suites: [ "mts-healthfitness", - "general-tests" + "general-tests", ], defaults: ["mts-target-sdk-version-current"], static_libs: [ @@ -35,7 +35,7 @@ android_test { "framework-healthfitness.impl", "androidx.test.runner", "mockito-target-extended-minus-junit4", - "truth-prebuilt", + "truth", "services.core", "androidx.test.ext.truth", ], @@ -54,4 +54,4 @@ android_test { // Test coverage system runs on different devices. Need to // compile for all architecture. compile_multilib: "both", -}
\ No newline at end of file +} |