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
This commit is contained in:
Nathan Toone 2015-02-17 14:47:53 -07:00
Родитель b91be074e6
Коммит a8a7dd9d99
1 изменённых файлов: 2 добавлений и 1 удалений

Просмотреть файл

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