mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1433308 - Update 'mach android-emulator' configurations; r=jmaher 

Various updates to emulator command lines. Use -skip-adb-auth. Use -verbose
instead of trying to specify debug categories. Use more -memory and -cores
where applicable. Use -ranchu and -selinux permissive where applicable.
This commit is contained in:
Geoff Brown 2018-01-25 17:01:23 -07:00
Родитель ca7cee6c2a
Коммит a993a26609
1 изменённых файлов: 21 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

36
testing/mozbase/mozrunner/mozrunner/devices/android_device.py
Просмотреть файл

@ -59,41 +59,48 @@ AVD_DICT = {
'4.3': AvdInfo('Android 4.3',
'mozemulator-4.3',
'testing/config/tooltool-manifests/androidarm_4_3/mach-emulator.manifest',
['-show-kernel', '-debug',
'init,console,gles,memcheck,adbserver,adbclient,adb,avd_config,socket'],
['-skip-adb-auth', '-verbose', '-show-kernel'],
False),
'6.0': AvdInfo('Android 6.0',
'mozemulator-6.0',
'testing/config/tooltool-manifests/androidarm_6_0/mach-emulator.manifest',
['-show-kernel', '-debug',
'init,console,gles,memcheck,adbserver,adbclient,adb,avd_config,socket'],
['-skip-adb-auth', '-verbose', '-show-kernel'
# -ranchu fails
# -memory has no effect
],
False),
'7.0': AvdInfo('Android 7.0',
'mozemulator-7.0',
'testing/config/tooltool-manifests/androidarm_7_0/mach-emulator.manifest',
['-debug',
'init,console,gles,memcheck,adbserver,adbclient,adb,avd_config,socket',
'-qemu', '-m', '2048'],
['-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',
['-debug',
'init,console,gles,memcheck,adbserver,adbclient,adb,avd_config,socket',
['-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',
['-debug',
'init,console,gles,memcheck,adbserver,adbclient,adb,avd_config,socket',
['-skip-adb-auth', '-verbose', '-show-kernel',
'-ranchu',
'-qemu', '-m', '2048'],
# does not boot if '-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',
['-show-kernel', '-verbose',
['-skip-adb-auth', '-verbose', '-show-kernel',
'-ranchu',
'-selinux', 'permissive',
# does not boot if '-engine', 'qemu2',
'-memory', '3072', '-cores', '4',
'-qemu', '-enable-kvm'],
True)
}
@ -495,8 +502,7 @@ class AndroidEmulator(object):
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, "-port", "5554"]
command = [self.emulator_path, "-avd", self.avd_info.name]
if self.gpu:
command += ['-gpu', 'swiftshader']
if self.avd_info.extra_args: