bug 1339087 - adjust android l10n mozconfigs and merge day configs for tc builds. r=rail a=release
authorAki Sasaki <asasaki@mozilla.com>
Tue, 14 Feb 2017 10:06:31 -0800
changeset 378444 273f9d9d0feb3ca99c8966e41ec2eb8caefc57ad
parent 378443 9849d98ca87741734806f9676c1a1c3e981a50ac
child 378445 6c660ca9126fbc8f2c9fd91d7c48853d2268d136
push id1419
push userjlund@mozilla.com
push dateMon, 10 Apr 2017 20:44:07 +0000
treeherdermozilla-release@5e6801b73ef6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrail, release
bugs1339087
milestone53.0a2
bug 1339087 - adjust android l10n mozconfigs and merge day configs for tc builds. r=rail a=release
mobile/android/config/mozconfigs/android-api-15/l10n-nightly
mobile/android/config/mozconfigs/android-api-15/l10n-release
mobile/android/config/mozconfigs/android-x86/l10n-nightly
mobile/android/config/mozconfigs/android-x86/l10n-release
testing/mozharness/configs/merge_day/aurora_to_beta.py
testing/mozharness/configs/merge_day/beta_to_release.py
--- a/mobile/android/config/mozconfigs/android-api-15/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-api-15/l10n-nightly
@@ -1,12 +1,12 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # L10n
-ac_add_options --with-l10n-base=..
+ac_add_options --with-l10n-base=../../mozilla-aurora
 
 # 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-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=../../mozilla-aurora
 
 # 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-nightly
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
@@ -1,12 +1,12 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # L10n
-ac_add_options --with-l10n-base=..
+ac_add_options --with-l10n-base=../../mozilla-aurora
 
 # Global options
 ac_add_options --disable-tests
 
 # Android
 ac_add_options --target=i386-linux-android
 ac_add_options --with-android-min-sdk=15
 
--- 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=../../mozilla-aurora
 
 # 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"),
     ],