commit 64ee6e2bc6a57d5649fddddaba456fdb7521e15e
author Colin Cross <ccross@android.com> Mon Mar 25 15:21:29 2024 -0700
committer Colin Cross <ccross@android.com> Tue Mar 26 13:56:06 2024 -0700
tree fa7070524d865a2ed8b061ee0218650e5e3bef5f
parent 417dae889d11929722b68a83294505181b394e29

Don't use androidx nodeps modules

The androidx nodeps modules were an internal implementation detail,
they are being removed.  Replace the nodeps dependencies with the
non-nodeps versions.

Bug: 326265727
Test: builds
Flag: None
Change-Id: Ief6c23460c27c64eaf9220563316bdbcc5b8d86b

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",
     ],