Bug 1333443 - fixes mozilla-beta osx uni mozconfigs post migration, r=rail a=testing FIREFOX_52_0b1_BUILD2 FIREFOX_52_0b1_RELEASE
authorJordan Lund <jlund@mozilla.com>
Tue, 24 Jan 2017 16:57:13 +0000
changeset 368857 78ae21055d9f303be257abe155ba9dee466c0651
parent 368856 49ee6ecf35c2b576755453eebd648035d882779b
child 368858 6c44d7b72386be8362d0c536a95a92a3b0fc1a4f
push id1369
push userjlorenzo@mozilla.com
push dateMon, 27 Feb 2017 14:59:41 +0000
treeherdermozilla-release@d75a1dba431f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrail, testing
bugs1333443
milestone52.0
Bug 1333443 - fixes mozilla-beta osx uni mozconfigs post migration, r=rail a=testing
browser/config/mozconfigs/macosx-universal/l10n-mozconfig
browser/config/mozconfigs/macosx-universal/nightly
--- a/browser/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ b/browser/config/mozconfigs/macosx-universal/l10n-mozconfig
@@ -1,14 +1,14 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/build/macosx/mozconfig.common"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --enable-official-branding
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
 
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
--- a/browser/config/mozconfigs/macosx-universal/nightly
+++ b/browser/config/mozconfigs/macosx-universal/nightly
@@ -9,13 +9,13 @@ ac_add_options --enable-instruments
 if test `uname -s` != Linux; then
   ac_add_options --enable-dtrace
 fi
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
 
-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"