Bug 1319351 - Avoid splash.rc depending on files in dist/branding. r?mshal draft
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 22 Nov 2016 16:59:43 +0900
changeset 442287 d545336d3c60dc009440c31591f16a02df3bbaeb
parent 442286 1f42bf686c28ce7f6d6926376a6cdb240234c44b
child 442288 319e03b9e8a22a8fba3756cb1afc8b9e7a6724c8
push id36662
push userbmo:mh+mozilla@glandium.org
push dateTue, 22 Nov 2016 08:00:12 +0000
reviewersmshal
bugs1319351
milestone53.0a1
Bug 1319351 - Avoid splash.rc depending on files in dist/branding. r?mshal
browser/app/moz.build
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -85,10 +85,10 @@ if CONFIG['HAVE_CLOCK_MONOTONIC']:
 
 if CONFIG['MOZ_GPSD']:
     DEFINES['MOZ_GPSD'] = True
 
 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)