Bug 1372697 - Stop rewriting mobile/android's debug mozconfigs; r?glandium
We currently rewrite the "debug" mozconfigs for Fennec during uplift
day activities in order to change the branding of the application.
Strangely, we don't do this for browser/. Why, I'm not sure. And, yes,
I looked (the code appears to have its origins in the first checkin of
a Python script to build/tools where process from a wiki page was
effectively converted to Python). The best I can tell is whoever
wrote things initially saw "branding" in the debug mozconfig and
decided it should be converted along with all the other repo
references in mozconfigs.
While, yes, beta debug builds should be branded properly, if the
lack of branding is good enough for Firefox, I reckon it is good enough
for Fennec. It is more work to do the right thing. So be lazy and
remove proper branding for Fennec debug builds.
MozReview-Commit-ID: Kj81JiUYpol
--- a/testing/mozharness/configs/merge_day/beta_to_release.py
+++ b/testing/mozharness/configs/merge_day/beta_to_release.py
@@ -13,17 +13,17 @@ config = {
"replacements": [
# File, from, to
("{}{}".format(d, f),
"ac_add_options --with-branding=mobile/android/branding/beta",
"ac_add_options --with-branding=mobile/android/branding/official")
for d in ["mobile/android/config/mozconfigs/android-api-15/",
"mobile/android/config/mozconfigs/android-x86/",
"mobile/android/config/mozconfigs/android-aarch64/"]
- for f in ["debug", "nightly", "nightly-l10n"]
+ for f in ["nightly", "nightly-l10n"]
] + [
# File, from, to
(f, "ac_add_options --with-l10n-base=../../mozilla-beta",
"ac_add_options --with-l10n-base=../../mozilla-release")
for f in ["mobile/android/config/mozconfigs/android-api-15/nightly-l10n",
"mobile/android/config/mozconfigs/android-x86/nightly-l10n",
"mobile/android/config/mozconfigs/android-aarch64/nightly-l10n"]
] + [
--- a/testing/mozharness/configs/merge_day/central_to_beta.py
+++ b/testing/mozharness/configs/merge_day/central_to_beta.py
@@ -12,17 +12,17 @@ config = {
"replacements": [
# File, from, to
("{}{}".format(d, f),
"ac_add_options --with-branding=mobile/android/branding/nightly",
"ac_add_options --with-branding=mobile/android/branding/beta")
for d in ["mobile/android/config/mozconfigs/android-api-15/",
"mobile/android/config/mozconfigs/android-x86/",
"mobile/android/config/mozconfigs/android-aarch64/"]
- for f in ["debug", "nightly", "nightly-l10n"]
+ for f in ["nightly", "nightly-l10n"]
] + [
# File, from, to
(f, "ac_add_options --with-l10n-base=../../l10n-central",
"ac_add_options --with-l10n-base=../../mozilla-beta")
for f in ["mobile/android/config/mozconfigs/android-api-15/nightly-l10n",
"mobile/android/config/mozconfigs/android-x86/nightly-l10n",
"mobile/android/config/mozconfigs/android-aarch64/nightly-l10n"]
] + [