summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-03-27 04:17:09 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-03-27 04:17:09 +0000
commit55afce9107ea882fe236acc5653aef9d6fb2185b (patch)
treec30a7d8d5a6726b09974e9742883d4aa836517b9
parent564011d100ce691179e31bfaaa86d39a32a3d2b1 (diff)
parent64ee6e2bc6a57d5649fddddaba456fdb7521e15e (diff)
downloadbase-55afce9107ea882fe236acc5653aef9d6fb2185b.tar.gz
Merge "Don't use androidx nodeps modules" into main
-rw-r--r--packages/SystemUI/Android.bp2
-rw-r--r--packages/SystemUI/animation/Android.bp4
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index f8e207c8061a..999507b300e4 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -329,7 +329,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",
"platform-test-annotations",
diff --git a/packages/SystemUI/animation/Android.bp b/packages/SystemUI/animation/Android.bp
index b900ea0c0f65..e945f1eb0991 100644
--- a/packages/SystemUI/animation/Android.bp
+++ b/packages/SystemUI/animation/Android.bp
@@ -41,7 +41,7 @@ android_library {
],
static_libs: [
- "androidx.core_core-animation-nodeps",
+ "androidx.core_core-animation",
"androidx.core_core-ktx",
"androidx.annotation_annotation",
"SystemUIShaderLib",
@@ -62,7 +62,7 @@ android_library {
],
static_libs: [
- "androidx.core_core-animation-nodeps",
+ "androidx.core_core-animation",
"androidx.core_core-ktx",
"androidx.annotation_annotation",
],