Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1e9d97f authored Oct 10, 2023 by Krzysztof Kosiński Committed by Automerger Merge Worker Oct 10, 2023

Merge "Clean up obsolete aliases for Truth." into main am: 40bf9f85 am: ab735019 am: 81294687

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2776034

Change-Id: I354c809d29a0cb77fd1e4224afbf1b0fd0607cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents bac2f5c2 81294687

android/app/tests/unit/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ java_defaults {
		"frameworks-base-testutils",
		"gson",
		"mockito-target",
		"truth-prebuilt",
		"truth",
		],

		asset_dirs: ["src/com/android/bluetooth/btservice/storage/schemas"],

service/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -171,7 +171,7 @@ android_robolectric_test {
		"mockito-robolectric-prebuilt",
		"platform-test-annotations",
		"testng",
		"truth-prebuilt",
		"truth",
		],

		upstream: true,

service/tests/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ android_test {
		"mockito-target-extended-minus-junit4",
		"platform-compat-test-rules",
		"platform-test-annotations",
		"truth-prebuilt",
		"truth",
		],

		libs: [