Bug 1319351 - Avoid splash.rc depending on files in dist/branding. r=mshal

--HG--
extra : rebase_source : 410f94ff78fb179aa5cb3b4ece38818a86ae4b4e

browser/app/moz.build

@@ -90,5 +90,5 @@ if CONFIG['MOZ_LINUX_32_SSE2_STARTUP_ERROR']:
     DEFINES['MOZ_LINUX_32_SSE2_STARTUP_ERROR'] = True
 
 for icon in ('firefox', 'document', 'newwindow', 'newtab', 'pbmode'):
-    DEFINES[icon.upper() + '_ICO'] = '"%s/dist/branding/%s.ico"' % (
-        TOPOBJDIR, icon)
+    DEFINES[icon.upper() + '_ICO'] = '"%s/%s/%s.ico"' % (
+        TOPOBJDIR, CONFIG['MOZ_BRANDING_DIRECTORY'], icon)