Closed Bug 1133983 Opened 5 years ago Closed 5 years ago

Allow for overriding of resources in branding directories

Categories

(Firefox for Android :: General, defect)

All
macOS
defect
Not set

Tracking

()

RESOLVED FIXED
Firefox 38
Tracking Status
firefox38 --- fixed

People

(Reporter: toonetown, Assigned: toonetown)

Details

Attachments

(1 file)

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.
Simply switches the ordering of the ANDROID_RES_DIRS
Attachment #8565656 - Flags: review?(nalexander)
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.
Attachment #8565656 - Flags: review?(nalexander) → review+
Assignee: nobody → nathan
Status: NEW → ASSIGNED
Hardware: x86 → All
https://hg.mozilla.org/mozilla-central/rev/8fa40864937c
Status: ASSIGNED → RESOLVED
Closed: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 38
You need to log in before you can comment on or make changes to this bug.