Bug 1426566 - Stop removing --enable-profiling during uplift; r=froydnj
authorGregory Szorc <gps@mozilla.com>
Tue, 09 Jan 2018 11:47:49 -0800
changeset 450217 3e88948848f810df2f5af02cbd6ce521b6a4329d
parent 450216 9e220db2bf10f0e3b4e3343f8cbced57c98e8a43
child 450218 7b41371e4b3ea65b564d8e0b8edb07be67a13b61
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1426566
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1426566 - Stop removing --enable-profiling during uplift; r=froydnj 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
testing/mozharness/configs/merge_day/central_to_beta.py
--- 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