commit 7fa918d2ed71afcc6fe0dabed399575c4ac868dc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Mar 27 04:46:35 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 27 04:46:35 2024 +0000
tree b3c22521efad10ad23255b3e98f0a1ad2933e8ab
parent 04b951c1ddf5bcb4d1a3845a2862e6d56ce339e6
parent e26393c5d2698d20823af1f36e20df223cf5e0a0

Merge "Don't use androidx nodeps modules" into main am: 55afce9107 am: e26393c5d2

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>

packages/SystemUI/Android.bp

diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index f911269..dc7850f 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -289,7 +289,7 @@
         "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

diff --git a/packages/SystemUI/animation/Android.bp b/packages/SystemUI/animation/Android.bp
index 2268d16..a6d750f 100644
--- a/packages/SystemUI/animation/Android.bp
+++ b/packages/SystemUI/animation/Android.bp
@@ -41,7 +41,7 @@
     ],
 
     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 @@
     ],
 
     static_libs: [
-        "androidx.core_core-animation-nodeps",
+        "androidx.core_core-animation",
         "androidx.core_core-ktx",
         "androidx.annotation_annotation",
     ],