Bug 1443208 - Fix: Allow android-assemble-app. r?Build,jlund
The previous commit works perfectly... except the mozharness action
only happens if you specify it in many places. Here's the rest of the
places, so that it actually gets applied.
I took the time to inline a variable that can no longer be
meaningfully changed.
MozReview-Commit-ID: LGHoEOWD7vx
--- a/testing/mozharness/configs/multi_locale/standalone_mozilla-central.py
+++ b/testing/mozharness/configs/multi_locale/standalone_mozilla-central.py
@@ -5,29 +5,27 @@ BUILD_DIR = "mozilla-central"
# e.g. "releases/mozilla-aurora"
REPO_PATH = "mozilla-central"
# This is where the l10n repos are (everything after https://hg.mozilla.org/)
# for mozilla-central, that's "l10n-central".
# For mozilla-aurora, that's "releases/l10n/mozilla-aurora"
L10N_REPO_PATH = "l10n-central"
# Currently this is assumed to be a subdirectory of your build dir
OBJDIR = "objdir-droid"
-# Set this to mobile/xul for XUL Fennec
-ANDROID_DIR = "mobile/android"
# Absolute path to your mozconfig.
# By default it looks at "./mozconfig"
MOZCONFIG = os.path.join(os.getcwd(), "mozconfig")
config = {
"work_dir": ".",
"log_name": "multilocale",
"objdir": OBJDIR,
"locales_file": "%s/mobile/locales/l10n-changesets.json" % BUILD_DIR,
"locales_platform": "android-multilocale",
- "locales_dir": "%s/locales" % ANDROID_DIR,
+ "locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/%s" % REPO_PATH,
"branch": "default",
"dest": BUILD_DIR,
}],
"vcs_share_base": "/builds/hg-shared",
"l10n_repos": [],
@@ -38,12 +36,13 @@ config = {
"mozconfig": MOZCONFIG,
"default_actions": [
"pull-locale-source",
"build",
"package-en-US",
"backup-objdir",
"restore-objdir",
"add-locales",
+ "android-assemble-app",
"package-multi",
"summary",
],
}
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -1338,16 +1338,17 @@ or run without that action (ie: --no-{ac
sys.executable,
multil10n_path,
'--config-file',
'multi_locale/%s_%s.json' % (branch, multi_config_pf),
'--config-file',
'multi_locale/android-mozharness-build.json',
'--pull-locale-source',
'--add-locales',
+ '--android-assemble-app',
'--package-multi',
'--summary',
]
self.run_command(cmd, env=self.query_build_env(), cwd=base_work_dir,
halt_on_failure=True)
package_cmd = [