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

Commit 7fa918d2 authored Mar 27, 2024 by Treehugger Robot Committed by Automerger Merge Worker Mar 27, 2024

Merge "Don't use androidx nodeps modules" into main am: 55afce91 am: e26393c5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3013921

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

parents 04b951c1 e26393c5

packages/SystemUI/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -289,7 +289,7 @@ android_library {
		"WindowManager-Shell",
		"LowLightDreamLib",
		"motion_tool_lib",
		"androidx.core_core-animation-testing-nodeps",
		"androidx.core_core-animation-testing",
		"androidx.compose.ui_ui",
		"flag-junit",
		"ravenwood-junit",

packages/SystemUI/animation/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ android_library {
		],

		static_libs: [
		"androidx.core_core-animation-nodeps",
		"androidx.core_core-animation",
		"androidx.core_core-ktx",
		"androidx.annotation_annotation",
		"com_android_systemui_flags_lib",
		@@ -64,7 +64,7 @@ android_library {
		],

		static_libs: [
		"androidx.core_core-animation-nodeps",
		"androidx.core_core-animation",
		"androidx.core_core-ktx",
		"androidx.annotation_annotation",
		],