Bug 1426566 - Stop removing --enable-profiling during uplift; r?Build
This line no longer occurs in mozconfigs. So we don't need to remove
it. moz.configure already stops implying --enable-profiling for
non-Nightly builds.
MozReview-Commit-ID: 97Yxh8Crsn8
--- a/testing/mozharness/configs/merge_day/central_to_beta.py
+++ b/testing/mozharness/configs/merge_day/central_to_beta.py
@@ -24,27 +24,16 @@ config = {
"ac_add_options --enable-official-branding")
for f in ["browser/config/mozconfigs/linux32/l10n-mozconfig",
"browser/config/mozconfigs/linux64/l10n-mozconfig",
"browser/config/mozconfigs/win32/l10n-mozconfig",
"browser/config/mozconfigs/win64/l10n-mozconfig",
"browser/config/mozconfigs/macosx64/l10n-mozconfig"]
] + [
# File, from, to
- (f, "ac_add_options --enable-profiling", "") for f in
- ["mobile/android/config/mozconfigs/android-api-16/nightly",
- "mobile/android/config/mozconfigs/android-x86/nightly",
- "mobile/android/config/mozconfigs/android-aarch64/nightly",
- "browser/config/mozconfigs/linux32/nightly",
- "browser/config/mozconfigs/linux64/nightly",
- "browser/config/mozconfigs/macosx64/nightly",
- "browser/config/mozconfigs/win32/nightly",
- "browser/config/mozconfigs/win64/nightly"]
- ] + [
- # File, from, to
("browser/confvars.sh",
"ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central",
"ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release"),
("browser/confvars.sh",
"MAR_CHANNEL_ID=firefox-mozilla-central",
"MAR_CHANNEL_ID=firefox-mozilla-beta"),
] + [
# File, from, to