Bug 1433308 - Switch android emulator gpu from swiftshader to swiftshader_indirect; r=me,a=test-only
authorGeoff Brown <gbrown@mozilla.com>
Mon, 29 Oct 2018 16:17:04 -0600
changeset 499856 ed8ea654ccde9f893d933c88b51d2acd41154ee2
parent 499855 1c7d0042fc4afa47750926b5c63e75ffb9580d4c
child 499857 8ff29f3d64b79cfe630e5ce302fc2bca7e02f425
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, test-only
bugs1433308
milestone65.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 1433308 - Switch android emulator gpu from swiftshader to swiftshader_indirect; r=me,a=test-only The _indirect variant was introduced in emulator 27.0.2 (Dec 2017) and swiftshader proper is deprecated.
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
@@ -509,17 +509,17 @@ class AndroidEmulator(object):
         def outputHandler(line):
             self.emulator_log.write("<%s>\n" % line)
             if "Invalid value for -gpu" in line or "Invalid GPU mode" in line:
                 self.gpu = False
         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']
+            command += ['-gpu', 'swiftshader_indirect']
         if self.avd_info.extra_args:
             # -enable-kvm option is not valid on OSX
             if _get_host_platform() == 'macosx64' 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')
         _log_debug("Starting the emulator with this command: %s" %