wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1244298 - Download android-api-15 artifacts. r=ahunt

Browse Source
This commit is contained in:
Nick Alexander 2016-02-01 10:30:36 -08:00
parent 5201c9e89b
commit 2504a8e318
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/mozbuild/mozbuild/artifacts.py
View File

@ -377,7 +377,7 @@ class WinArtifactJob(ArtifactJob):
# The values correpsond to a pair of (<package regex>, <test archive regex>). # The values correpsond to a pair of (<package regex>, <test archive regex>).
JOB_DETAILS = { JOB_DETAILS = {
# 'android-api-9': (AndroidArtifactJob, 'public/build/fennec-(.*)\.android-arm\.apk'), # '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)), None)),
'android-x86': (AndroidArtifactJob, ('public/build/fennec-(.*)\.android-i386\.apk', 'android-x86': (AndroidArtifactJob, ('public/build/fennec-(.*)\.android-i386\.apk',
None)), None)),

4
python/mozbuild/mozbuild/mach_commands.py
View File

@ -1407,7 +1407,7 @@ class ArtifactSubCommand(SubCommand):
def __call__(self, func): def __call__(self, func):
after = SubCommand.__call__(self, func) after = SubCommand.__call__(self, func)
jobchoices = { jobchoices = {
'android-api-11', 'android-api-15',
'android-x86', 'android-x86',
'linux', 'linux',
'linux64', 'linux64',
@ -1480,7 +1480,7 @@ class PackageFrontend(MachCommandBase):
if self.substs.get('MOZ_BUILD_APP', '') == 'mobile/android': if self.substs.get('MOZ_BUILD_APP', '') == 'mobile/android':
if self.substs['ANDROID_CPU_ARCH'] == 'x86': if self.substs['ANDROID_CPU_ARCH'] == 'x86':
return 'android-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 # TODO: check for 32/64 bit builds. We'd like to use HAVE_64BIT_BUILD
# but that relies on the compile environment. # but that relies on the compile environment.
if self.defines.get('XP_LINUX', False): if self.defines.get('XP_LINUX', False):