From 5b829937bbef50d93a549a0a6c4fab03d696ad74 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 17 Feb 2018 06:36:04 -0500 Subject: Remove stub installer - Part 2: Basilisk --- browser/branding/official/moz.build | 5 ----- 1 file changed, 5 deletions(-) (limited to 'browser/branding/official/moz.build') diff --git a/browser/branding/official/moz.build b/browser/branding/official/moz.build index f1a839c9d..7fda7496c 100644 --- a/browser/branding/official/moz.build +++ b/browser/branding/official/moz.build @@ -23,17 +23,12 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': ] BRANDING_FILES += [ 'appname.bmp', - 'bgintro.bmp', 'branding.nsi', - 'clock.bmp', 'document.ico', 'firefox.ico', 'newtab.ico', 'newwindow.ico', - 'particles.bmp', 'pbmode.ico', - 'pencil-rtl.bmp', - 'pencil.bmp', 'wizHeader.bmp', 'wizHeaderRTL.bmp', 'wizWatermark.bmp', -- cgit v1.2.3 From 170b82c2e254d3aa9b4e5f31f26dc89283a472a6 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 17 Feb 2018 10:56:35 -0500 Subject: Reduce redundencies in Basilisk branding --- browser/branding/official/moz.build | 47 ++----------------------------------- 1 file changed, 2 insertions(+), 45 deletions(-) (limited to 'browser/branding/official/moz.build') diff --git a/browser/branding/official/moz.build b/browser/branding/official/moz.build index 7fda7496c..e3b7fd1ab 100644 --- a/browser/branding/official/moz.build +++ b/browser/branding/official/moz.build @@ -9,48 +9,5 @@ DIRS += ['content', 'locales'] DIST_SUBDIR = 'browser' export('DIST_SUBDIR') -JS_PREFERENCE_FILES += [ - 'pref/firefox-branding.js', -] - -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': - FINAL_TARGET_FILES['..'] += [ - 'basilisk.VisualElementsManifest.xml', - ] - FINAL_TARGET_FILES.VisualElements += [ - 'VisualElements_150.png', - 'VisualElements_70.png', - ] - BRANDING_FILES += [ - 'appname.bmp', - 'branding.nsi', - 'document.ico', - 'firefox.ico', - 'newtab.ico', - 'newwindow.ico', - 'pbmode.ico', - 'wizHeader.bmp', - 'wizHeaderRTL.bmp', - 'wizWatermark.bmp', - ] -elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - BRANDING_FILES += [ - 'background.png', - 'disk.icns', - 'document.icns', - 'dsstore', - 'firefox.icns', - ] -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', - ] +include('../shared/branding.mozbuild') +ApplicationBranding() \ No newline at end of file -- cgit v1.2.3