--- a/testing/mozbase/mozrunner/mozrunner/devices/android_device.py
+++ b/testing/mozbase/mozrunner/mozrunner/devices/android_device.py
@@ -85,27 +85,27 @@ AVD_DICT = {
['-skip-adb-auth', '-verbose', '-show-kernel',
'-qemu', '-m', '1024', '-enable-kvm'],
True),
'x86-6.0': AvdInfo('Android 6.0 x86',
'mozemulator-x86-6.0',
'testing/config/tooltool-manifests/androidx86_6_0/mach-emulator.manifest',
['-skip-adb-auth', '-verbose', '-show-kernel',
'-ranchu',
- # does not boot if '-engine', 'qemu2',
+ '-engine', 'qemu2',
'-memory', '3072', '-cores', '4',
'-qemu', '-enable-kvm'],
True),
'x86-7.0': AvdInfo('Android 7.0 x86',
'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',
- # does not boot if '-engine', 'qemu2',
'-memory', '3072', '-cores', '4',
'-qemu', '-enable-kvm'],
True)
}
def _get_device(substs, device_serial=None):
global devices
@@ -525,17 +525,17 @@ class AndroidEmulator(object):
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" %
' '.join(command))
_log_debug("Emulator output will be written to '%s'" %
log_path)
self.proc = ProcessHandler(
command, storeOutput=False, processOutputLine=outputHandler,
- env=env)
+ env=env, ignore_children=True)
self.proc.run()
_log_debug("Emulator started with pid %d" %
int(self.proc.proc.pid))
def wait_for_start(self):
"""
Verify that the emulator is running, the emulator device is visible
to adb, and Android has booted.