diff options
author | Matt A. Tobin <email@mattatobin.com> | 2018-02-17 11:37:33 -0500 |
---|---|---|
committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-17 11:37:33 -0500 |
commit | 8a119434ac94d18b888550bea1b125aba1ad446e (patch) | |
tree | 52b0e3bb47f74253f3f97f5f7f9e297edd4dc335 /browser/branding/official/moz.build | |
parent | 050cfdc4cabb50df1a3f0005e967359dc800131e (diff) | |
parent | 170b82c2e254d3aa9b4e5f31f26dc89283a472a6 (diff) | |
download | UXP-8a119434ac94d18b888550bea1b125aba1ad446e.tar UXP-8a119434ac94d18b888550bea1b125aba1ad446e.tar.gz UXP-8a119434ac94d18b888550bea1b125aba1ad446e.tar.lz UXP-8a119434ac94d18b888550bea1b125aba1ad446e.tar.xz UXP-8a119434ac94d18b888550bea1b125aba1ad446e.zip |
Merge branch 'stub-branding-cc'
Diffstat (limited to 'browser/branding/official/moz.build')
-rw-r--r-- | browser/branding/official/moz.build | 52 |
1 files changed, 2 insertions, 50 deletions
diff --git a/browser/branding/official/moz.build b/browser/branding/official/moz.build index f1a839c9d..e3b7fd1ab 100644 --- a/browser/branding/official/moz.build +++ b/browser/branding/official/moz.build @@ -9,53 +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', - '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', - ] -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 |