From a8a7dd9d99d3a7ac1176fbf2ff4522a5ea6e91f3 Mon Sep 17 00:00:00 2001
From: Nathan Toone <nathan@toonetown.com>
Date: Tue, 17 Feb 2015 14:47:53 -0700
Subject: [PATCH] Bug 1133983 - Allow overriding of resources in branding.
 r=nalexander

Change the order of the ANDROID_RES_DIRS to specify the branded
directory first: this way any resources specified in both locations
will use the version in the branding directory.

--HG--
extra : rebase_source : 51c51088b346a2cd2f1a9c670eb8960382c60101
---
 mobile/android/base/moz.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index e65fcb150fd6..9237e5c3309f 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -669,9 +669,10 @@ if not CONFIG['MOZILLA_OFFICIAL']:
         'org/lucasr/dspec/RawResource.java'
     ] ]
 
+# Putting branding earlier allows branders to override default resources.
 ANDROID_RES_DIRS += [
-    SRCDIR + '/resources',
     TOPSRCDIR + '/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res',
+    SRCDIR + '/resources',
     OBJDIR + '/res',
 ]