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

Commit fabc873f authored by Ben Murdoch's avatar Ben Murdoch
Browse files

Fix ordering of resource libraries for Quickstep build. 

The ordering of depedent resource libraries is important when more
than one library provides a particular resource. In the case
of the Launcher3QuickStepLib target, the most specific resources are in
QuickstepResLib target so it should be the last dependency.

Bug: 208647810
Test: builds, resources overlaid correctly.

Change-Id: I47ac36faae18a8382fe5e8f9c83ac0c2ae4c310f
parent 9c7baac1

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",
@@ -283,11 +287,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,