Bug 1562938 - Update 'mach android-emulator' for emulator 29.0.11; r=aerickson
authorGeoff Brown <gbrown@mozilla.com>
Wed, 10 Jul 2019 13:09:26 +0000
changeset 482151 0767d7ec77a86df7a9650dc763c22c0e694378a5
parent 482150 707956090735e80a38bd5b8a8735a95caa2f88ad
child 482152 87a8c6317e12e1f2a7daf4b08d9935f6f610e7d0
push id36271
push useraiakab@mozilla.com
push dateWed, 10 Jul 2019 21:50:49 +0000
treeherdermozilla-central@e704e3565db9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaerickson
bugs1562938
milestone70.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 1562938 - Update 'mach android-emulator' for emulator 29.0.11; r=aerickson Use the same options for x86-7.0 emulator via mach as in CI. Differential Revision: https://phabricator.services.mozilla.com/D36631
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
@@ -62,25 +62,23 @@ AVD_DICT = {
                    ['-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),
-    'x86-7.0': AvdInfo('Android 7.0 x86',
+    'x86-7.0': AvdInfo('Android 7.0 x86/x86_64',
                        'mozemulator-x86-7.0',
                        'testing/config/tooltool-manifests/androidx86_7_0/mach-emulator.manifest',
                        ['-skip-adb-auth', '-verbose', '-show-kernel',
                         '-ranchu',
-                        '-engine', 'qemu2',
                         '-selinux', 'permissive',
-                        '-memory', '3072', '-cores', '4',
-                        '-qemu', '-enable-kvm'],
+                        '-memory', '3072', '-cores', '4'],
                        True)
 }
 
 
 def _get_device(substs, device_serial=None):
     global devices
     if device_serial in devices:
         device = devices[device_serial]
@@ -467,17 +465,17 @@ class AndroidEmulator(object):
         # create an empty auth file to disable emulator authentication
         auth_file = open(EMULATOR_AUTH_FILE, 'w')
         auth_file.close()
 
         env = os.environ
         env['ANDROID_AVD_HOME'] = os.path.join(EMULATOR_HOME_DIR, "avd")
         command = [self.emulator_path, "-avd", self.avd_info.name]
         if self.gpu:
-            command += ['-gpu', 'swiftshader_indirect']
+            command += ['-gpu', 'on']
         if self.avd_info.extra_args:
             # -enable-kvm option is not valid on OSX and Windows
             if _get_host_platform() in ('macosx64', 'win32') and \
                '-enable-kvm' in self.avd_info.extra_args:
                 self.avd_info.extra_args.remove('-enable-kvm')
             command += self.avd_info.extra_args
         log_path = os.path.join(EMULATOR_HOME_DIR, 'emulator.log')
         self.emulator_log = open(log_path, 'w+')