--- a/mozilla/release-fennec-mozilla-release.py.template
+++ b/mozilla/release-fennec-mozilla-release.py.template
@@ -61,24 +61,24 @@ releaseConfig['l10nJsonFile'] = r
releaseConfig['otherReposToTag'] = {
'build/compare-locales': 'RELEASE_AUTOMATION',
'build/buildbot': 'production-0.8',
'build/partner-repacks': 'default',
'build/mozharness': 'production',
}
# Platform configuration
-releaseConfig['enUSPlatforms'] = ('android', 'android-x86')
+releaseConfig['enUSPlatforms'] = ('android-api-9', 'android-api-11', 'android-x86')
releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
releaseConfig['unittestPlatforms'] = ()
releaseConfig['talosTestPlatforms'] = ()
releaseConfig['enableUnittests'] = False
# L10n configuration
-releaseConfig['l10nPlatforms'] = ('android',)
+releaseConfig['l10nPlatforms'] = ('android-api-9', 'android-api-11')
releaseConfig['l10nNotifyPlatforms'] = releaseConfig['l10nPlatforms']
releaseConfig['mergeLocales'] = True
releaseConfig['enableMultiLocale'] = True
# Mercurial account
releaseConfig['hgUsername'] = 'ffxbld'
releaseConfig['hgSshKey'] = '/home/mock_mozilla/.ssh/ffxbld_rsa'
@@ -101,17 +101,18 @@ releaseConfig['partnerRepackConfig'] = {
'script': 'scripts/mobile_partner_repack.py',
'config_file': 'partner_repacks/release_mozilla-release_android.py',
},
},
}
# mozconfigs
releaseConfig['mozconfigs'] = {
- 'android': 'mobile/android/config/mozconfigs/android/release',
+ 'android-api-9': 'mobile/android/config/mozconfigs/android-api-9-10-constrained/release',
+ 'android-api-11': 'mobile/android/config/mozconfigs/android-api-11/release',
'android-x86': 'mobile/android/config/mozconfigs/android-x86/release',
}
releaseConfig['releaseChannel'] = 'release'
releaseConfig["updateChannels"] = {
"release": {
"ruleId": -1, # TBD
"localTestChannel": "release-localtest",
"cdnTestChannel": "release-cdntest",
@@ -138,43 +139,50 @@ releaseConfig["svnSshKey"] = "/
releaseConfig['usePrettyNames'] = False
releaseConfig['disableStandaloneRepacks'] = True
releaseConfig['disablePermissionCheck'] = True
releaseConfig['disableVirusCheck'] = True
releaseConfig['enableUpdatePackaging'] = False
releaseConfig['balrog_api_root'] = None
releaseConfig['single_locale_options'] = {
- 'android': [
+ 'android-api-9': [
'--cfg',
- 'single_locale/release_mozilla-release_android.py',
+ 'single_locale/release_mozilla-release_android_api_9.py',
+ '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
+ ],
+ 'android-api-11': [
+ '--cfg',
+ 'single_locale/release_mozilla-release_android_api_11.py',
'--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
],
}
releaseConfig['multilocale_config'] = {
'platforms': {
- 'android':
+ 'android-api-9':
+ 'multi_locale/release_mozilla-release_android.json',
+ 'android-api-11':
'multi_locale/release_mozilla-release_android.json',
'android-x86':
'multi_locale/release_mozilla-release_android-x86.json',
},
'multilocaleOptions': [
'--tag-override=%s_RELEASE' % releaseConfig['baseTag'],
'--pull-locale-source',
'--add-locales',
'--package-multi',
'--summary',
]
}
releaseConfig['enableSigningAtBuildTime'] = True
releaseConfig['enablePartialMarsAtBuildTime'] = False
releaseConfig['autoGenerateChecksums'] = False
releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('android', 'android-x86', 'linux')
+releaseConfig['mock_platforms'] = ('android-api-9', 'android-api-11', 'android-x86', 'linux')
releaseConfig['ftpSymlinkName'] = 'latest'
releaseConfig['partialUpdates'] = {}
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.mozilla.com/api'
releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_fennec.py'
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['bouncer_aliases'] = {