diff --git a/testing/mozharness/configs/multi_locale/ash_android-x86.json b/testing/mozharness/configs/multi_locale/ash_android-x86.json
index 6fe6c442b248235afa4efdd7241d740b30a860df..6d20c0a5bd6b1ad29a55bdf4c9ab52c00510ba45 100644
--- a/testing/mozharness/configs/multi_locale/ash_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/ash_android-x86.json
@@ -23,7 +23,6 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
}
diff --git a/testing/mozharness/configs/multi_locale/ash_android.json b/testing/mozharness/configs/multi_locale/ash_android.json
index 991ecc00185af26ce9ef85642c1c3df74c544ca6..e22d9ecb4f66547e630f7340137075841b74be7e 100644
--- a/testing/mozharness/configs/multi_locale/ash_android.json
+++ b/testing/mozharness/configs/multi_locale/ash_android.json
@@ -23,6 +23,5 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/date_android-armv6.json b/testing/mozharness/configs/multi_locale/date_android-armv6.json
index d6ea042897745c6c3177222ebc6ac737c91088f1..1a0bf0eabdeeaed800e38ae494e2e5de6b612cb3 100644
--- a/testing/mozharness/configs/multi_locale/date_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/date_android-armv6.json
@@ -23,7 +23,6 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/nightly"
}
diff --git a/testing/mozharness/configs/multi_locale/date_android-x86.json b/testing/mozharness/configs/multi_locale/date_android-x86.json
index 692433b980aab35639d1dbef0bf975e390f804c8..0443e1e02d85297f637ca0b0a784187cbded25c9 100644
--- a/testing/mozharness/configs/multi_locale/date_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/date_android-x86.json
@@ -23,7 +23,6 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
}
diff --git a/testing/mozharness/configs/multi_locale/date_android.json b/testing/mozharness/configs/multi_locale/date_android.json
index 75a166e425da593fd05b4257693b8e88ea7bcdfc..d70afb9f52e89a6e38f00af63b8f6bbd6188ed8f 100644
--- a/testing/mozharness/configs/multi_locale/date_android.json
+++ b/testing/mozharness/configs/multi_locale/date_android.json
@@ -23,6 +23,5 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/jamun_android-armv6.json b/testing/mozharness/configs/multi_locale/jamun_android-armv6.json
index e36fc43b0bb1eadabf7039ada037d3ced09ef18d..28dd8c9d7b6f07e684da1a54a0eaffa7287c681f 100644
--- a/testing/mozharness/configs/multi_locale/jamun_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/jamun_android-armv6.json
@@ -22,7 +22,6 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/nightly"
}
diff --git a/testing/mozharness/configs/multi_locale/jamun_android-x86.json b/testing/mozharness/configs/multi_locale/jamun_android-x86.json
index f31539f3fa7a4e10fad9a1efa5249ca223869879..17a3b7441df24a765bb89e5d52e39e5218b9512b 100644
--- a/testing/mozharness/configs/multi_locale/jamun_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/jamun_android-x86.json
@@ -22,7 +22,6 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
}
diff --git a/testing/mozharness/configs/multi_locale/jamun_android.json b/testing/mozharness/configs/multi_locale/jamun_android.json
index 0a92bb8140a7ee28dca0b0d3d8916b1566b11691..39cdefe3d5b8daf67df7990829a71c41027f2c40 100644
--- a/testing/mozharness/configs/multi_locale/jamun_android.json
+++ b/testing/mozharness/configs/multi_locale/jamun_android.json
@@ -22,6 +22,5 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json b/testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json
index 122b9255a8c0fccff03adda637c864938f89e6b6..415daabee6f84a2e9abd80bf158f84d6b0c62375 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json
@@ -23,7 +23,6 @@
"hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
"hg_l10n_tag": "default",
"l10n_dir": "mozilla-aurora",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/nightly"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json b/testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json
index bbd0cc4cbe7383a0d4b4e19f4a2ef898d6e33460..32939397b7c99876aa1c74909f84bc1e3cf34267 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json
@@ -23,7 +23,6 @@
"hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
"hg_l10n_tag": "default",
"l10n_dir": "mozilla-aurora",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-aurora_android.json b/testing/mozharness/configs/multi_locale/mozilla-aurora_android.json
index aa44ba7ce4d36f5cda0529379480589cb927e0a8..71a60975d4524f05ae745f4b8667fc7384a1565c 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-aurora_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android.json
@@ -23,6 +23,5 @@
"hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
"hg_l10n_tag": "default",
"l10n_dir": "mozilla-aurora",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json b/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
index 242324c94f95bf811209897a0793d616fdfae4fd..7c49db92be56571cbb535e01a61534373bb7b5ac 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
@@ -23,7 +23,6 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/nightly"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json b/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
index 67dddd4901b8ecfb4463af3ca217abf71b0bc606..795663ff38dbda07d4f5efd4d8363299f3806179 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
@@ -23,7 +23,6 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-beta_android.json b/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
index d07b02c61855675596e48cda53242f98da02f9b4..78e342f4c08a30c9f5b148f16646a04bba4a962e 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
@@ -23,6 +23,5 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json b/testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json
index 98c9f36ff0abfcb61e5a3244598be1af166ddf76..ff244a43a94a0b8cbe0efbb62131098febce6c19 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json
@@ -23,7 +23,6 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/nightly"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json b/testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json
index 468a7e0cfe5cf9de4a50957f35a64981cd4ff894..8de4f34a5468afe47c810ffd11d50be36209b802 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json
@@ -23,7 +23,6 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-central_android.json b/testing/mozharness/configs/multi_locale/mozilla-central_android.json
index a99c46bc2fef0e60b10bfa207dc211b5cbe38dd5..101ad669c298e8d0cac34fe6299bf00fd5683471 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-central_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android.json
@@ -23,6 +23,5 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json b/testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json
index dbf07ad5bf481496c4f85dd4f99483ecb91c3552..f2d7cafe91fcad4db23728e9ae0d6b80ff1b2e6f 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json
@@ -23,7 +23,6 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/nightly"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json b/testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json
index 7014735f9ca41ed8afc2380195bba8f49e4755a7..1c9e5f7b805597db6a13054e60daf343ac0e26bd 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json
@@ -23,7 +23,6 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-release_android.json b/testing/mozharness/configs/multi_locale/mozilla-release_android.json
index fbacb99f9a988e8a78e74e7557a4dae3895208c5..8c8f9c7db8437b3ec2d5d45214f3f758cc736f9f 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android.json
@@ -23,6 +23,5 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json
index 9784e61b61ab4e555d7deeac90d4282d28c67686..d498873434e08245d89914e1032f6c4236dd93c1 100644
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json
@@ -28,7 +28,6 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"required_config_vars": ["tag_override"],
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
}
diff --git a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
index a684b395b27fc7dcb8a927f353e70dc5928b2a1f..725b79531baa08096d89e4b832a5e9b4ed81f43c 100644
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
@@ -28,7 +28,6 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"required_config_vars": ["tag_override"],
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
}
diff --git a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
index 6fc4c1b29b7b0f5f0bf7f19eadbaf2b5e7578c58..bdebacbf3d4a6bea823ea6275f926058ae768a3d 100644
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
@@ -28,6 +28,5 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"required_config_vars": ["tag_override"],
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/release_mozilla-release_android-armv6.json b/testing/mozharness/configs/multi_locale/release_mozilla-release_android-armv6.json
index 125d3d8b0d8b1c8f8ab80047645b43f7b2f6bd51..75f8085d39bab49e8eb3793464cbee01208da1f4 100644
--- a/testing/mozharness/configs/multi_locale/release_mozilla-release_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-release_android-armv6.json
@@ -28,7 +28,6 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"required_config_vars": ["tag_override"],
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
}
diff --git a/testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json b/testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json
index a5428e4b2d9c8077a6d061e4a7fb49e6961184aa..596fc0173f5de424bda52dfdb0a34c4956b32299 100644
--- a/testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json
@@ -28,7 +28,6 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"required_config_vars": ["tag_override"],
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
}
diff --git a/testing/mozharness/configs/multi_locale/release_mozilla-release_android.json b/testing/mozharness/configs/multi_locale/release_mozilla-release_android.json
index 8b6351aeb512036e1e2bdf929850e5bb8d2071c9..7f9ac962940f27182529315714969849fe290a10 100644
--- a/testing/mozharness/configs/multi_locale/release_mozilla-release_android.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-release_android.json
@@ -28,6 +28,5 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"required_config_vars": ["tag_override"],
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-armv6.json b/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-armv6.json
index 032e04ff79604e5ea3d2287ffc06c844413dc777..42e4b168a8b878f30cd7ad8112fc064fa241fb11 100644
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-armv6.json
@@ -28,7 +28,6 @@
"hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-beta",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
}
diff --git a/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-x86.json b/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-x86.json
index a055b0ab993d3c7cf63d4a53c2be8d1eb4bf7ca6..fd1f969ec82b0a765f64d056724b0951d2c2605b 100644
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-x86.json
@@ -28,7 +28,6 @@
"hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-beta",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
}
diff --git a/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android.json b/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android.json
index 1447ffd91881f85c66493165bbb0f1747a08ec1d..4cdfa83d2a9f7e72abee7f0a245fd78a819983c4 100644
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android.json
@@ -28,6 +28,5 @@
"hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-beta",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-armv6.json b/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-armv6.json
index 5e2f26dc1dace88720b1fbae88ad79d2880b8f2f..af8a771af2e3401319af68885d65948c8e7ef693 100644
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-armv6.json
@@ -28,7 +28,6 @@
"hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-release",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
}
diff --git a/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-x86.json b/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-x86.json
index 68feec852a97ab06f628fb84c477218140456fda..51e2c44f2d8bacb209cf02263673ad555cb38485 100644
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-x86.json
@@ -28,7 +28,6 @@
"hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-release",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
}
diff --git a/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android.json b/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android.json
index 4ed17c48705f926acbe32430e65ef83ace385516..126c3bd37000f9c8ae1c067518bc6fd54bc00124 100644
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android.json
@@ -28,6 +28,5 @@
"hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-release",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/standalone_mozilla-central.py b/testing/mozharness/configs/multi_locale/standalone_mozilla-central.py
index fce75aeb3509b87171fdd415f57ec87197d39721..e6688ad0339abce17305853b9ea4ce5b8a3b6ab6 100644
--- a/testing/mozharness/configs/multi_locale/standalone_mozilla-central.py
+++ b/testing/mozharness/configs/multi_locale/standalone_mozilla-central.py
@@ -34,7 +34,6 @@ config = {
"hg_l10n_base": "https://hg.mozilla.org/%s" % L10N_REPO_PATH,
"hg_l10n_tag": "default",
"l10n_dir": "l10n",
- "merge_locales": True,
"mozilla_dir": BUILD_DIR,
"mozconfig": MOZCONFIG,
"default_actions": [
diff --git a/testing/mozharness/configs/single_locale/ash_android-api-16.py b/testing/mozharness/configs/single_locale/ash_android-api-16.py
index 2afa3f6c36f752a8461a061f965a59d127cba066..cba3a6b0b15bab47ad4b64245739d05e49b10a49 100644
--- a/testing/mozharness/configs/single_locale/ash_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/ash_android-api-16.py
@@ -49,12 +49,10 @@ config = {
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": OBJDIR,
"EN_US_BINARY_URL": EN_US_BINARY_URL,
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
diff --git a/testing/mozharness/configs/single_locale/date_android-api-16.py b/testing/mozharness/configs/single_locale/date_android-api-16.py
index e6f4d2f63afaa0b6907e03fb7b15402216ff0ed3..76ac4e75831d5fb7d33da610312574fd8924d687 100644
--- a/testing/mozharness/configs/single_locale/date_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/date_android-api-16.py
@@ -47,12 +47,10 @@ config = {
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "nightly-date",
},
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
diff --git a/testing/mozharness/configs/single_locale/jamun_android-api-16.py b/testing/mozharness/configs/single_locale/jamun_android-api-16.py
index e887d0d11811cadf80341559794220338193eba8..2e5b22e0bc10d6c91c1b08ea6e3e43e51204c872 100644
--- a/testing/mozharness/configs/single_locale/jamun_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/jamun_android-api-16.py
@@ -46,12 +46,10 @@ config = {
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "nightly-jamun",
},
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
diff --git a/testing/mozharness/configs/single_locale/linux.py b/testing/mozharness/configs/single_locale/linux.py
index 85986d7ef18900ce09d06128cabdad67b5cf8f5b..e0ec0e3e75ba627a29df09ff8ecb608b1ab6822d 100644
--- a/testing/mozharness/configs/single_locale/linux.py
+++ b/testing/mozharness/configs/single_locale/linux.py
@@ -8,10 +8,8 @@ config = {
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'EN_US_PACKAGE_NAME': 'target.tar.bz2',
@@ -31,7 +29,6 @@ config = {
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist/previous",
diff --git a/testing/mozharness/configs/single_locale/linux64.py b/testing/mozharness/configs/single_locale/linux64.py
index d0abd3ce336371d190ce0edcfb99717ef4236527..1e868d174c40acd5ae473a7ebcfc0f040181a269 100644
--- a/testing/mozharness/configs/single_locale/linux64.py
+++ b/testing/mozharness/configs/single_locale/linux64.py
@@ -8,10 +8,8 @@ config = {
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'EN_US_PACKAGE_NAME': 'target.tar.bz2',
@@ -31,7 +29,6 @@ config = {
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist/previous",
diff --git a/testing/mozharness/configs/single_locale/linux64_devedition.py b/testing/mozharness/configs/single_locale/linux64_devedition.py
index 45833ecaa03a0df7ceccd858373d8a73169e2c1d..c22c1d549d0a49cf27419f6f631efe7ec7eb0d3c 100644
--- a/testing/mozharness/configs/single_locale/linux64_devedition.py
+++ b/testing/mozharness/configs/single_locale/linux64_devedition.py
@@ -8,10 +8,8 @@ config = {
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'EN_US_PACKAGE_NAME': 'target.tar.bz2',
@@ -31,7 +29,6 @@ config = {
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist/previous",
diff --git a/testing/mozharness/configs/single_locale/linux_devedition.py b/testing/mozharness/configs/single_locale/linux_devedition.py
index 20548fc8b066ad5eac84d964d4f070019d4dc8aa..d19d526497802ec2b036da67aed7b2fd02c25c60 100644
--- a/testing/mozharness/configs/single_locale/linux_devedition.py
+++ b/testing/mozharness/configs/single_locale/linux_devedition.py
@@ -8,10 +8,8 @@ config = {
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'EN_US_PACKAGE_NAME': 'target.tar.bz2',
@@ -31,7 +29,6 @@ config = {
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist/previous",
diff --git a/testing/mozharness/configs/single_locale/macosx64.py b/testing/mozharness/configs/single_locale/macosx64.py
index 09a6e86b853d3f28b355722eef8d8f05a3855614..37a9187c8c90cfa89734ad67620de44327d8a17b 100644
--- a/testing/mozharness/configs/single_locale/macosx64.py
+++ b/testing/mozharness/configs/single_locale/macosx64.py
@@ -14,10 +14,8 @@ config = {
"MOZ_PKG_PLATFORM": "mac",
# "IS_NIGHTLY": "yes",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
'EN_US_PACKAGE_NAME': 'target.dmg',
},
"ssh_key_dir": "~/.ssh",
@@ -39,7 +37,6 @@ config = {
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist/previous",
diff --git a/testing/mozharness/configs/single_locale/macosx64_devedition.py b/testing/mozharness/configs/single_locale/macosx64_devedition.py
index fb7081f9e86278f5b915e13e74236e3368bdbc38..352dff39afb8fc4a26ce517a2e2ac3c33a8c3f0b 100644
--- a/testing/mozharness/configs/single_locale/macosx64_devedition.py
+++ b/testing/mozharness/configs/single_locale/macosx64_devedition.py
@@ -14,10 +14,8 @@ config = {
"MOZ_PKG_PLATFORM": "mac",
# "IS_NIGHTLY": "yes",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
'EN_US_PACKAGE_NAME': 'target.dmg',
},
"ssh_key_dir": "~/.ssh",
@@ -39,7 +37,6 @@ config = {
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist/previous",
diff --git a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py b/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
index dac95682df8465b3635c00d66553b269c8ac0a55..b8a42f7f082a8cfbd1fd26bc297d2b7a8beb67c3 100644
--- a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
@@ -53,12 +53,10 @@ config = {
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": OBJDIR,
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
diff --git a/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py b/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
index 4158ff71413e9f99202fa166bfa4e5a2d2a5ad80..78bbd3a74b801a93dc49f7d30dd2a4cb1e53779a 100644
--- a/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
@@ -51,12 +51,10 @@ config = {
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
"MOZ_OBJDIR": OBJDIR,
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
"key_alias": "release",
diff --git a/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py b/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
index 6057f80a3f9155eeee69d4d7db1ab0f370849a61..3f139ca49c63534a37dc7cf00adda6a79e5deed4 100644
--- a/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
@@ -53,12 +53,10 @@ config = {
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": OBJDIR,
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
diff --git a/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py b/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
index 09a68cc6138c0b33f951ece8ce6145f78d5d24c2..646164d5808201184adea4943efb517aa1bd5827 100644
--- a/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
@@ -51,12 +51,10 @@ config = {
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
"MOZ_OBJDIR": OBJDIR,
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
"key_alias": "release",
diff --git a/testing/mozharness/configs/single_locale/staging_release_mozilla-beta_android_api_16.py b/testing/mozharness/configs/single_locale/staging_release_mozilla-beta_android_api_16.py
index 3e0f928a9ec98a5451695629b0bb436a3cb31e9e..d1d46c447678c4e7c5493f1b840320e265dfadc8 100644
--- a/testing/mozharness/configs/single_locale/staging_release_mozilla-beta_android_api_16.py
+++ b/testing/mozharness/configs/single_locale/staging_release_mozilla-beta_android_api_16.py
@@ -51,14 +51,12 @@ config = {
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_PKG_VERSION": "%(version)s",
"MOZ_OBJDIR": OBJDIR,
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"base_en_us_binary_url": EN_US_BINARY_URL,
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
"base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android-api-16/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates %(post_upload_extra)s",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
diff --git a/testing/mozharness/configs/single_locale/staging_release_mozilla-release_android_api_16.py b/testing/mozharness/configs/single_locale/staging_release_mozilla-release_android_api_16.py
index aecc77deddc2ace98712481a888cc9ffc2f0f7ca..db6ce33cd7c6dd4a0ede8b2ca5fd9e22a1beffc1 100644
--- a/testing/mozharness/configs/single_locale/staging_release_mozilla-release_android_api_16.py
+++ b/testing/mozharness/configs/single_locale/staging_release_mozilla-release_android_api_16.py
@@ -51,14 +51,12 @@ config = {
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_PKG_VERSION": "%(version)s",
"MOZ_OBJDIR": OBJDIR,
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"base_en_us_binary_url": EN_US_BINARY_URL,
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
"base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android-api-16/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates %(post_upload_extra)s",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
diff --git a/testing/mozharness/configs/single_locale/tc_linux32.py b/testing/mozharness/configs/single_locale/tc_linux32.py
index 965f900908101b515297865cd3094aed2c764bc0..c289341acc26ed95dae113c77b862629836898ae 100644
--- a/testing/mozharness/configs/single_locale/tc_linux32.py
+++ b/testing/mozharness/configs/single_locale/tc_linux32.py
@@ -10,10 +10,8 @@ config = {
"NO_MERCURIAL_SETUP_CHECK": "1",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
diff --git a/testing/mozharness/configs/single_locale/tc_linux64.py b/testing/mozharness/configs/single_locale/tc_linux64.py
index 4a92a0612d9cb9e4030f46dccf134b532041fcda..76c34208b7e40253e2c78c632bb56845f9f4ebe4 100644
--- a/testing/mozharness/configs/single_locale/tc_linux64.py
+++ b/testing/mozharness/configs/single_locale/tc_linux64.py
@@ -10,10 +10,8 @@ config = {
"NO_MERCURIAL_SETUP_CHECK": "1",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
diff --git a/testing/mozharness/configs/single_locale/tc_macosx64.py b/testing/mozharness/configs/single_locale/tc_macosx64.py
index bf64cb9071fa9929bad82c3517e5170acd9fc280..54e1dc86adb33e7d3f975b1cd1d4b46e0706ed1b 100644
--- a/testing/mozharness/configs/single_locale/tc_macosx64.py
+++ b/testing/mozharness/configs/single_locale/tc_macosx64.py
@@ -10,10 +10,8 @@ config = {
"NO_MERCURIAL_SETUP_CHECK": "1",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
diff --git a/testing/mozharness/configs/single_locale/tc_win32.py b/testing/mozharness/configs/single_locale/tc_win32.py
index 65c9404e42a29c12c574c633ea7f7def70f3588a..368b05dae0ba3b54af6e17a9de228b6866c3d5a9 100644
--- a/testing/mozharness/configs/single_locale/tc_win32.py
+++ b/testing/mozharness/configs/single_locale/tc_win32.py
@@ -15,10 +15,8 @@ config = {
"EN_US_INSTALLER_BINARY_URL": os.environ.get(
"EN_US_INSTALLER_BINARY_URL", os.environ.get(
"EN_US_BINARY_URL", EN_US_BINARY_URL)),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE', 'c:/builds/tooltool_cache'),
diff --git a/testing/mozharness/configs/single_locale/tc_win64.py b/testing/mozharness/configs/single_locale/tc_win64.py
index b1d51f088eaf148c5bcc5f90b15e2f82e1cb8f6e..eed5138f1054a8c739a17d3d8002d53f92f38df8 100644
--- a/testing/mozharness/configs/single_locale/tc_win64.py
+++ b/testing/mozharness/configs/single_locale/tc_win64.py
@@ -15,10 +15,8 @@ config = {
"EN_US_INSTALLER_BINARY_URL": os.environ.get(
"EN_US_INSTALLER_BINARY_URL", os.environ.get(
"EN_US_BINARY_URL", EN_US_BINARY_URL)),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE', 'c:/builds/tooltool_cache'),
diff --git a/testing/mozharness/configs/single_locale/try_android-api-16.py b/testing/mozharness/configs/single_locale/try_android-api-16.py
index 12557203b8f0f7cfb50f075f7c15c3211efb5f16..950a3199026353013b57f34d90c5d40c6b2f318b 100644
--- a/testing/mozharness/configs/single_locale/try_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/try_android-api-16.py
@@ -52,12 +52,10 @@ config = {
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "try", # XXX Invalid
},
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
diff --git a/testing/mozharness/configs/single_locale/win32.py b/testing/mozharness/configs/single_locale/win32.py
index ac35eddb5dab0c77a918ab456d4f36955c060dff..137d9c5d36bf4a328d0c4913ec6a35aa4a57616a 100644
--- a/testing/mozharness/configs/single_locale/win32.py
+++ b/testing/mozharness/configs/single_locale/win32.py
@@ -9,7 +9,6 @@ config = {
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",
@@ -42,7 +41,6 @@ config = {
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist\\previous",
diff --git a/testing/mozharness/configs/single_locale/win32_devedition.py b/testing/mozharness/configs/single_locale/win32_devedition.py
index c999cc533bdaf66db95cfdef5007dbafa9003c09..2e6afc81f8b701a32ea834c94f172d5104f3c8de 100644
--- a/testing/mozharness/configs/single_locale/win32_devedition.py
+++ b/testing/mozharness/configs/single_locale/win32_devedition.py
@@ -9,7 +9,6 @@ config = {
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",
@@ -42,7 +41,6 @@ config = {
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist\\previous",
diff --git a/testing/mozharness/configs/single_locale/win64.py b/testing/mozharness/configs/single_locale/win64.py
index c20d0fba1847308a0ddd6883e243789e4d8a906f..3c5ba7b15ce1d6c55cd8d07923da4e4ad7e8c4f7 100644
--- a/testing/mozharness/configs/single_locale/win64.py
+++ b/testing/mozharness/configs/single_locale/win64.py
@@ -11,7 +11,6 @@ config = {
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
"PATH": '%(abs_objdir)s\\..\\xz-5.2.3\\bin_x86-64;'
@@ -42,7 +41,6 @@ config = {
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist\\previous",
diff --git a/testing/mozharness/configs/single_locale/win64_devedition.py b/testing/mozharness/configs/single_locale/win64_devedition.py
index b69554288a3b93869eac3b3a1d09fedaa4081273..14c6750bb99d7b25a7c0dcbd864eda2eb9c3b027 100644
--- a/testing/mozharness/configs/single_locale/win64_devedition.py
+++ b/testing/mozharness/configs/single_locale/win64_devedition.py
@@ -11,7 +11,6 @@ config = {
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
"PATH": '%(abs_objdir)s\\..\\xz-5.2.3\\bin_x86-64;'
@@ -42,7 +41,6 @@ config = {
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist\\previous",