Bug 1519489 - remove the android 7.0 arm emulator r=gbrown

Differential Revision: https://phabricator.services.mozilla.com/D19095

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Andrew Erickson 2019-02-08 01:26:25 +00:00
parent bc7ba97c34
commit cbb252c256
2 changed files with 2 additions and 11 deletions

View File

@ -668,9 +668,9 @@ class AndroidEmulatorCommands(MachCommandBase):
conditions=[],
description='Run the Android emulator with an AVD from test automation.')
@CommandArgument('--version', metavar='VERSION',
choices=['4.3', '7.0', 'x86', 'x86-7.0'],
choices=['4.3', 'x86', 'x86-7.0'],
help='Specify Android version to run in emulator. '
'One of "4.3", "7.0", "x86", or "x86-7.0".')
'One of "4.3", "x86", or "x86-7.0".')
@CommandArgument('--wait', action='store_true',
help='Wait for emulator to be closed.')
@CommandArgument('--force-update', action='store_true',

View File

@ -63,15 +63,6 @@ AVD_DICT = {
'testing/config/tooltool-manifests/androidarm_4_3/mach-emulator.manifest',
['-skip-adb-auth', '-verbose', '-show-kernel'],
False),
'7.0': AvdInfo('Android 7.0',
'mozemulator-7.0',
'testing/config/tooltool-manifests/androidarm_7_0/mach-emulator.manifest',
['-skip-adb-auth', '-verbose',
# does not boot if '-show-kernel' -- how strange!
'-ranchu',
'-selinux', 'permissive',
'-memory', '3072', '-cores', '4'],
False),
'x86': AvdInfo('Android 4.2 x86',
'mozemulator-x86',
'testing/config/tooltool-manifests/androidx86/mach-emulator.manifest',