openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Ben Murdoch 2021-12-02 18:22:17 +00:00
parent 9c7baac12d
commit fabc873f72
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Android.bp
View File

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