Bug 1527708 - Fix default emulator selection for ARM. r=gbrown
authorJan Henning <jh+bugzilla@buttercookie.de>
Wed, 13 Feb 2019 20:43:14 +0000
changeset 459056 e249a6801e6e
parent 459055 593a2316ac28
child 459057 62e70b24ecb8
push id111913
push usershindli@mozilla.com
push dateThu, 14 Feb 2019 05:01:59 +0000
treeherdermozilla-inbound@a0752d7e8073 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown
bugs1527708
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1527708 - Fix default emulator selection for ARM. r=gbrown This bit of code annoyingly runs before we know whether we really need an emulator or not, so the error blocks testing even with a real device. Differential Revision: https://phabricator.services.mozilla.com/D19700
testing/mozbase/mozrunner/mozrunner/devices/android_device.py
--- a/testing/mozbase/mozrunner/mozrunner/devices/android_device.py
+++ b/testing/mozbase/mozrunner/mozrunner/devices/android_device.py
@@ -719,17 +719,17 @@ class AndroidEmulator(object):
 
     def _get_avd_type(self, requested):
         if requested in AVD_DICT.keys():
             return requested
         if self.substs:
             if not self.substs['TARGET_CPU'].startswith('arm'):
                 return 'x86-7.0'
             else:
-                return '7.0'
+                return '4.3'
         return 'x86-7.0'
 
 
 def _find_sdk_exe(substs, exe, tools):
     if tools:
         subdirs = ['emulator', 'tools']
     else:
         subdirs = ['platform-tools']