Bug 1080749 - Add nightly jobs for new splitapk Android builders, use old pre android multi locale config files, r=kmoir
--- a/misc.py
+++ b/misc.py
@@ -1672,18 +1672,26 @@ def generateBranchObjects(config, name,
else:
if 'android' in platform:
multiargs['multiLocaleScript'] = 'scripts/multil10n.py'
# android nightlies require mozharness
multiargs['mozharnessRepoPath'] = config.get('mozharness_repo_path')
if pf.get('multi_config_name'):
multiargs['multiLocaleConfig'] = pf['multi_config_name']
else:
+ if pf.get('multi_locale_config_platform'):
+ # normally we look for the mozharness config by platform. But since we have split
+ # 'android' into two platforms 'android-api-9' and 'android-api-10', this allows us
+ # to use the already existing '{branch}_android.json' config files for both without
+ # having to create a dozen new duplicate ones
+ multi_config_pf = pf['multi_locale_config_platform']
+ else:
+ multi_config_pf = platform
multiargs['multiLocaleConfig'] = 'multi_locale/%s_%s.json' % (
- name, platform)
+ name, multi_config_pf)
if config.get('enable_multi_locale') and pf.get('multi_locale'):
multiargs['multiLocale'] = True
multiargs['multiLocaleMerge'] = config['multi_locale_merge']
multiargs['compareLocalesRepoPath'] = config[
'compare_locales_repo_path']
multiargs['compareLocalesTag'] = config['compare_locales_tag']
multiargs['mozharnessMultiOptions'] = pf.get(
'mozharness_multi_options')