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

Commit 4f508c7f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix ordering of resource libraries for Quickstep build." into... 

Merge "Fix  ordering of resource libraries for Quickstep build." into sc-v2-dev am: 418185e4 am: f37e6466

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16388218

Change-Id: Iee7f3eb17f334a40bf3aaa24afed506aa1d6e42c
parents 739c56c1 f37e6466

Android.bp

+9 −1
Original line number Diff line number Diff line
@@ -258,6 +258,10 @@ android_library { 
        "go/res",

        "go/quickstep/res",

    ],

    // Note the ordering here is important when it comes to resource

    // overriding. We want the most specific resource overrides defined

    // in QuickstepResLib to take precendece, so it should be the final

    // dependency. See b/205278434 for how this can go wrong.

    static_libs: [

        "Launcher3CommonDepsLib",

        "QuickstepResLib",
@@ -285,11 +289,15 @@ android_library { 
    libs: [

        "framework-statsd",

    ],

    // Note the ordering here is important when it comes to resource

    // overriding. We want the most specific resource overrides defined

    // in QuickstepResLib to take precendece, so it should be the final

    // dependency. See b/208647810 for how this can go wrong.

    static_libs: [

        "QuickstepResLib",

        "SystemUI-statsd",

        "SystemUISharedLib",

        "Launcher3CommonDepsLib",

        "QuickstepResLib",

    ],

    manifest: "quickstep/AndroidManifest.xml",

    platform_apis: true,