Bug 1404823 - Now that nightly is called Firefox Nightly, with-macbundlename-prefix is not necessary r=rail

MozReview-Commit-ID: K3lXdLXdxAO

--HG--
extra : histedit_source : 9aab9f17133fc4d688998acde489c28d742158ca%2C4685746e4ce167d7611b135f86572c198307782c

browser/config/mozconfigs/macosx64/debug

@@ -10,10 +10,6 @@ export MOZILLA_OFFICIAL=1
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 

browser/config/mozconfigs/macosx64/debug-asan

@@ -9,10 +9,6 @@ ac_add_options --enable-optimize="-O1"
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 

browser/config/mozconfigs/macosx64/l10n-mozconfig

@@ -13,10 +13,6 @@ ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/nightly
 
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry

browser/config/mozconfigs/macosx64/nightly

@@ -10,13 +10,6 @@ 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
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly-try"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/macosx64/nightly-asan

@@ -8,10 +8,6 @@ ac_add_options --enable-optimize="-O2"
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 

browser/config/mozconfigs/whitelist

@@ -22,10 +22,6 @@ whitelist['nightly']['linux64'] += [
 ]
 
 whitelist['nightly']['macosx64'] += [
-    'if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then',
-    'if test "${MOZ_UPDATE_CHANNEL}" = "nightly-try"; then',
-    'ac_add_options --with-macbundlename-prefix=Firefox',
-    'fi',
     'ac_add_options --disable-install-strip',
     'ac_add_options --enable-instruments',
     'ac_add_options --enable-dtrace',