commit e26393c5d2698d20823af1f36e20df223cf5e0a0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Mar 27 04:32:15 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 27 04:32:15 2024 +0000
tree c30a7d8d5a6726b09974e9742883d4aa836517b9
parent 83fb7a0a9ceacbc91d2adbf65276bcd8ef915cae
parent 55afce9107ea882fe236acc5653aef9d6fb2185b

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

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

Change-Id: Ifbb5a7b0e15a0d6ce709e1241aec44a2178ac29d
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 f8e207c..999507b 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -329,7 +329,7 @@
         "WindowManager-Shell",
         "LowLightDreamLib",
         "motion_tool_lib",
-        "androidx.core_core-animation-testing-nodeps",
+        "androidx.core_core-animation-testing",
         "androidx.compose.ui_ui",
         "flag-junit",
         "platform-test-annotations",

packages/SystemUI/animation/Android.bp

diff --git a/packages/SystemUI/animation/Android.bp b/packages/SystemUI/animation/Android.bp
index b900ea0..e945f1e 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",
         "SystemUIShaderLib",
@@ -62,7 +62,7 @@
     ],
 
     static_libs: [
-        "androidx.core_core-animation-nodeps",
+        "androidx.core_core-animation",
         "androidx.core_core-ktx",
         "androidx.annotation_annotation",
     ],