bug 1339087 - adjust android merge day configs for tc builds. r?rail
MozReview-Commit-ID: 7l7w2KEUtbe
--- a/mobile/android/config/mozconfigs/android-api-15/l10n-release
+++ b/mobile/android/config/mozconfigs/android-api-15/l10n-release
@@ -1,12 +1,12 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# L10n
-ac_add_options --with-l10n-base=..
+ac_add_options --with-l10n-base=../../l10n-central
# Global options
ac_add_options --disable-tests
# Android
ac_add_options --with-android-min-sdk=15
ac_add_options --target=arm-linux-androideabi
--- a/mobile/android/config/mozconfigs/android-x86/l10n-release
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-release
@@ -1,12 +1,12 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# L10n
-ac_add_options --with-l10n-base=..
+ac_add_options --with-l10n-base=../../l10n-central
# Global options
ac_add_options --disable-tests
# Android
ac_add_options --target=i386-linux-android
ac_add_options --with-android-min-sdk=15
--- a/testing/mozharness/configs/merge_day/aurora_to_beta.py
+++ b/testing/mozharness/configs/merge_day/aurora_to_beta.py
@@ -15,16 +15,24 @@ config = {
"ac_add_options --with-branding=mobile/android/branding/aurora",
"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/"]
for f in ["debug", "nightly", "l10n-nightly"]
] + [
# File, from, to
("{}/{}".format(d, f),
+ "ac_add_options --with-l10n-base=../../mozilla-aurora",
+ "ac_add_options --with-l10n-base=../../mozilla-beta")
+ for d in ["mobile/android/config/mozconfigs/android-api-15/",
+ "mobile/android/config/mozconfigs/android-x86/"]
+ for f in ["l10n-nightly", "l10n-release"]
+ ] + [
+ # File, from, to
+ ("{}/{}".format(d, f),
"ac_add_options --with-branding=browser/branding/aurora",
"ac_add_options --with-branding=browser/branding/nightly")
for d in ["browser/config/mozconfigs/linux32",
"browser/config/mozconfigs/linux64",
"browser/config/mozconfigs/win32",
"browser/config/mozconfigs/win64",
"browser/config/mozconfigs/macosx64"]
for f in ["debug", "nightly"]
--- a/testing/mozharness/configs/merge_day/beta_to_release.py
+++ b/testing/mozharness/configs/merge_day/beta_to_release.py
@@ -15,16 +15,24 @@ config = {
("{}/{}".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/"]
for f in ["debug", "nightly", "l10n-nightly", "l10n-release", "release"]
] + [
# File, from, to
+ ("{}/{}".format(d, f),
+ "ac_add_options --with-l10n-base=../../mozilla-aurora",
+ "ac_add_options --with-l10n-base=../../mozilla-beta")
+ for d in ["mobile/android/config/mozconfigs/android-api-15/",
+ "mobile/android/config/mozconfigs/android-x86/"]
+ for f in ["l10n-nightly", "l10n-release"]
+ ] + [
+ # 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_aurora.py
+++ b/testing/mozharness/configs/merge_day/central_to_aurora.py
@@ -24,21 +24,22 @@ config = {
for d in ["browser/config/mozconfigs/linux32",
"browser/config/mozconfigs/linux64",
"browser/config/mozconfigs/win32",
"browser/config/mozconfigs/win64",
"browser/config/mozconfigs/macosx64"]
for f in ["debug", "nightly", "l10n-mozconfig"]
] + [
# File, from, to
- ("{}/l10n-nightly".format(d),
+ ("{}/{}".format(d, f),
"ac_add_options --with-l10n-base=../../l10n-central",
- "ac_add_options --with-l10n-base=..")
+ "ac_add_options --with-l10n-base=../../mozilla-aurora")
for d in ["mobile/android/config/mozconfigs/android-api-15/",
"mobile/android/config/mozconfigs/android-x86/"]
+ for f in ["l10n-mozconfig", "l10n-release"]
] + [
# File, from, to
(f, "ac_add_options --enable-profiling", "") for f in
["mobile/android/config/mozconfigs/android-api-15/nightly",
"mobile/android/config/mozconfigs/android-x86/nightly",
"browser/config/mozconfigs/linux32/nightly",
"browser/config/mozconfigs/linux64/nightly",
"browser/config/mozconfigs/macosx64/nightly",