From 0da74ae1704b71e8e09543677a1de98584fb8c74 Mon Sep 17 00:00:00 2001 From: Nick Alexander Date: Mon, 1 Feb 2016 10:30:36 -0800 Subject: [PATCH] Bug 1244298 - Download android-api-15 artifacts. r=ahunt --HG-- extra : commitid : 37fyfy52TDo extra : amend_source : c2ef5e2d213982a07200ceca7edf9d1626b3c5f9 --- python/mozbuild/mozbuild/artifacts.py | 2 +- python/mozbuild/mozbuild/mach_commands.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/artifacts.py index 7c6db5c999c9..2856f8ff667d 100644 --- a/python/mozbuild/mozbuild/artifacts.py +++ b/python/mozbuild/mozbuild/artifacts.py @@ -377,7 +377,7 @@ class WinArtifactJob(ArtifactJob): # The values correpsond to a pair of (, ). JOB_DETAILS = { # 'android-api-9': (AndroidArtifactJob, 'public/build/fennec-(.*)\.android-arm\.apk'), - 'android-api-11': (AndroidArtifactJob, ('public/build/fennec-(.*)\.android-arm\.apk', + 'android-api-15': (AndroidArtifactJob, ('public/build/fennec-(.*)\.android-arm\.apk', None)), 'android-x86': (AndroidArtifactJob, ('public/build/fennec-(.*)\.android-i386\.apk', None)), diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py index 02a7122777e6..d5c0b090ac91 100644 --- a/python/mozbuild/mozbuild/mach_commands.py +++ b/python/mozbuild/mozbuild/mach_commands.py @@ -1407,7 +1407,7 @@ class ArtifactSubCommand(SubCommand): def __call__(self, func): after = SubCommand.__call__(self, func) jobchoices = { - 'android-api-11', + 'android-api-15', 'android-x86', 'linux', 'linux64', @@ -1480,7 +1480,7 @@ class PackageFrontend(MachCommandBase): if self.substs.get('MOZ_BUILD_APP', '') == 'mobile/android': if self.substs['ANDROID_CPU_ARCH'] == 'x86': return 'android-x86' - return 'android-api-11' + return 'android-api-15' # TODO: check for 32/64 bit builds. We'd like to use HAVE_64BIT_BUILD # but that relies on the compile environment. if self.defines.get('XP_LINUX', False):