1133983 - Allow for overriding of resources in branding directories

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect)

Description

[Nathan Toone [:toonetown]]

Currently, you are able to add a new android resource by placing them in ${MOZ_BRANDING_DIRECTOR}/res - but you cannot override an existing resource.  This is due to the fact that the resource already exists in ${SRCDIR}/resources, and the order specified in moz.build prevents that.

I would suggest that resources in the branding directory are the "canonical" ones - and thus branded builds are able to override resources such as strings and images that may already exist in the source directory.

Comment 1

[Nathan Toone [:toonetown]]

Attachment: bug-1133983-fix.patch

Simply switches the ordering of the ANDROID_RES_DIRS

Comment 2

[Nathan Toone [:toonetown]]

Try server https://treeherder.mozilla.org/#/jobs?repo=try&revision=5e9f64323e82

Comment 3

[Nick Alexander :nalexander [he/him]]

Comment on attachment 8565656 [details] [diff] [review]
bug-1133983-fix.patch

Review of attachment 8565656 [details] [diff] [review]:
-----------------------------------------------------------------

Fine by me.  I can land this, with the change.

::: mobile/android/base/moz.build
@@ +669,5 @@
>          'org/lucasr/dspec/RawResource.java'
>      ] ]
>  
>  ANDROID_RES_DIRS += [
> +    TOPSRCDIR + '/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res',

Add a comment explaining why you want this first above ANDROID_RES_DIRS.

Comment 4

[Nick Alexander :nalexander [he/him]]

https://hg.mozilla.org/integration/fx-team/rev/8fa40864937c

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/8fa40864937c