Bug 1403084 - Make beta point at l10n-central for android. [beta patch] r=mtabara a=release
This fixes Single Locale Repacks for Fennec 57.0 betas.
This broke because our merge scripts rewrote l10n-central to mozilla-beta expecting the l10n repo to be called 'mozilla-beta', which is no longer true with cross-channel l10n. When we patched the configs we didn't see a 'mozilla-beta' entry here, butmissed that the merge-day scripts change it on us.
MozReview-Commit-ID: F7BJzpZg0Xj
--- a/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
@@ -1,14 +1,14 @@
NO_NDK=1
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# L10n
-ac_add_options --with-l10n-base=../../mozilla-beta
+ac_add_options --with-l10n-base=../../l10n-central
. "$topsrcdir/build/mozconfig.no-compile"
# Global options
ac_add_options --disable-tests
# Android
ac_add_options --with-android-min-sdk=21
--- a/mobile/android/config/mozconfigs/android-api-16/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-api-16/l10n-nightly
@@ -1,14 +1,14 @@
NO_NDK=1
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# L10n
-ac_add_options --with-l10n-base=../../mozilla-beta
+ac_add_options --with-l10n-base=../../l10n-central
. "$topsrcdir/build/mozconfig.no-compile"
# Global options
ac_add_options --disable-tests
# Android
# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
--- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
@@ -1,14 +1,14 @@
NO_NDK=1
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# L10n
-ac_add_options --with-l10n-base=../../mozilla-beta
+ac_add_options --with-l10n-base=../../l10n-central
. "$topsrcdir/build/mozconfig.no-compile"
# Global options
ac_add_options --disable-tests
# Android
# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
--- a/testing/mozharness/configs/merge_day/beta_to_release.py
+++ b/testing/mozharness/configs/merge_day/beta_to_release.py
@@ -16,23 +16,16 @@ config = {
"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-16/",
"mobile/android/config/mozconfigs/android-x86/",
"mobile/android/config/mozconfigs/android-aarch64/"]
for f in ["debug", "nightly", "l10n-nightly"]
] + [
# 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-16/l10n-nightly",
- "mobile/android/config/mozconfigs/android-x86/l10n-nightly",
- "mobile/android/config/mozconfigs/android-aarch64/l10n-nightly"]
- ] + [
- # File, from, to
("browser/confvars.sh",
"ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release",
"ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release"),
("browser/confvars.sh",
"MAR_CHANNEL_ID=firefox-mozilla-beta",
"MAR_CHANNEL_ID=firefox-mozilla-release"),
],
--- a/testing/mozharness/configs/merge_day/central_to_beta.py
+++ b/testing/mozharness/configs/merge_day/central_to_beta.py
@@ -24,23 +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 --with-l10n-base=../../l10n-central",
- "ac_add_options --with-l10n-base=../../mozilla-beta")
- for f in ["mobile/android/config/mozconfigs/android-api-16/l10n-nightly",
- "mobile/android/config/mozconfigs/android-x86/l10n-nightly",
- "mobile/android/config/mozconfigs/android-aarch64/l10n-nightly"]
- ] + [
- # 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",