Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1599534 - Update help and version names for 'mach android-emulator'; r=erahm

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D54802

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Geoff Brown 2019-12-10 23:07:59 +00:00
parent cee320b5fb
commit 3f66236867
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mobile/android/mach_commands.py
View File

@ -365,9 +365,14 @@ class AndroidEmulatorCommands(MachCommandBase):
conditions=[],
description='Run the Android emulator with an AVD from test automation.')
@CommandArgument('--version', metavar='VERSION',
choices=['4.3', 'x86', 'x86-7.0'],
help='Specify Android version to run in emulator. '
'One of "4.3", "x86", or "x86-7.0".')
choices=['arm-4.3', 'x86-4.2', 'x86-7.0'],
help='Specify which AVD to run in emulator. '
'One of "arm-4.3" (Android 4.3 supporting armv7 binaries), '
'"x86-4.2" (Android 4.2 supporting x86 binaries), or '
'"x86-7.0" (Android 7.0 supporting x86 or x86_64 binaries, '
'recommended for most applications). '
'By default, "arm-4.3" will be used if the current build environment '
'architecture is arm; otherwise "x86-7.0".')
@CommandArgument('--wait', action='store_true',
help='Wait for emulator to be closed.')
@CommandArgument('--force-update', action='store_true',

22
testing/mozbase/mozrunner/mozrunner/devices/android_device.py
View File

@ -62,17 +62,17 @@ class AvdInfo(object):
and the parameters for each reflect those used in mozharness.
"""
AVD_DICT = {
'4.3': AvdInfo('Android 4.3',
'mozemulator-4.3',
'testing/config/tooltool-manifests/androidarm_4_3/mach-emulator.manifest',
['-skip-adb-auth', '-verbose', '-show-kernel'],
False),
'x86': AvdInfo('Android 4.2 x86',
'mozemulator-x86',
'testing/config/tooltool-manifests/androidx86/mach-emulator.manifest',
['-skip-adb-auth', '-verbose', '-show-kernel',
'-qemu', '-m', '1024', '-enable-kvm'],
True),
'arm-4.3': AvdInfo('Android 4.3',
'mozemulator-4.3',
'testing/config/tooltool-manifests/androidarm_4_3/mach-emulator.manifest',
['-skip-adb-auth', '-verbose', '-show-kernel'],
False),
'x86-4.2': AvdInfo('Android 4.2 x86',
'mozemulator-x86',
'testing/config/tooltool-manifests/androidx86/mach-emulator.manifest',
['-skip-adb-auth', '-verbose', '-show-kernel',
'-qemu', '-m', '1024', '-enable-kvm'],
True),
'x86-7.0': AvdInfo('Android 7.0 x86/x86_64',
'mozemulator-x86-7.0',
'testing/config/tooltool-manifests/androidx86_7_0/mach-emulator.manifest',