From fabc873f72e374ae9a6b6f741472e14c4edc4a21 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 2 Dec 2021 18:22:17 +0000
Subject: [PATCH] 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
---
 Android.bp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index 60ef5b1ab7..bab994add5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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,