Bug 1264162 - Move branding installation to branding-common.mozbuild; r=glandium
authorMike Shal <mshal@mozilla.com>
Thu, 14 Apr 2016 14:40:33 -0400
changeset 331268 d73c2e06cc47b7512adf65a0c1adf7d447ad99f8
parent 331267 1418ce4fcd0b1b589840c2282abf8c723a226446
child 331269 9f90060e64a0980803e85e6b2d475eece7f402fa
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1264162
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1264162 - Move branding installation to branding-common.mozbuild; r=glandium MozReview-Commit-ID: LCUkgGPDmHq
browser/app/moz.build
browser/branding/branding-common.mozbuild
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -18,24 +18,16 @@ JS_PREFERENCE_PP_FILES += [
 SOURCES += [
     'nsBrowserApp.cpp',
 ]
 
 FINAL_TARGET_FILES += ['blocklist.xml']
 FINAL_TARGET_FILES.defaults.profile += ['profile/prefs.js']
 FINAL_TARGET_FILES.defaults += ['permissions']
 
-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
-    FINAL_TARGET_FILES.icons += ['!/dist/branding/mozicon128.png']
-    FINAL_TARGET_FILES.chrome.icons.default += [
-        '!/dist/branding/default16.png',
-        '!/dist/branding/default32.png',
-        '!/dist/branding/default48.png',
-    ]
-
 DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 
 LOCAL_INCLUDES += [
     '!/build',
     '/toolkit/xre',
     '/xpcom/base',
     '/xpcom/build',
 ]
--- a/browser/branding/branding-common.mozbuild
+++ b/browser/branding/branding-common.mozbuild
@@ -38,8 +38,14 @@ def FirefoxBranding():
         ]
     elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
         BRANDING_FILES += [
             'default16.png',
             'default32.png',
             'default48.png',
             'mozicon128.png',
         ]
+        FINAL_TARGET_FILES.icons += ['mozicon128.png']
+        FINAL_TARGET_FILES.chrome.icons.default += [
+            'default16.png',
+            'default32.png',
+            'default48.png',
+        ]