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

Commit e26393c5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ifbb5a7b0e15a0d6ce709e1241aec44a2178ac29d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 83fb7a0a 55afce91

packages/SystemUI/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -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",

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

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

    ],