diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/build/fuchsia/aemu_target.py | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/build/fuchsia/aemu_target.py')
| -rw-r--r-- | chromium/build/fuchsia/aemu_target.py | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/chromium/build/fuchsia/aemu_target.py b/chromium/build/fuchsia/aemu_target.py index 0e3bc8f4ead..e997541ab8c 100644 --- a/chromium/build/fuchsia/aemu_target.py +++ b/chromium/build/fuchsia/aemu_target.py @@ -11,7 +11,9 @@ import logging from common import GetEmuRootForPlatform + class AemuTarget(qemu_target.QemuTarget): + def __init__(self, output_dir, target_cpu, system_log_file, emu_type, cpu_cores, require_kvm, ram_size_mb, enable_graphics, hardware_gpu): @@ -60,7 +62,7 @@ class AemuTarget(qemu_target.QemuTarget): # All args after -fuchsia flag gets passed to QEMU aemu_command.extend([ '-feature', aemu_features, '-window-size', '1024x600', '-gpu', - gpu_target, '-fuchsia' + gpu_target, '-verbose', '-fuchsia' ]) aemu_command.extend(self._BuildQemuConfig()) @@ -73,3 +75,19 @@ class AemuTarget(qemu_target.QemuTarget): '-device', 'ich9-ahci,id=ahci']) logging.info(' '.join(aemu_command)) return aemu_command + + def _GetVulkanIcdFile(self): + return os.path.join(GetEmuRootForPlatform(self._emu_type), 'lib64', + 'vulkan', 'vk_swiftshader_icd.json') + + def _SetEnv(self): + env = os.environ.copy() + aemu_logging_env = { + "ANDROID_EMU_VK_NO_CLEANUP": "1", + "ANDROID_EMUGL_LOG_PRINT": "1", + "ANDROID_EMUGL_VERBOSE": "1", + "VK_ICD_FILENAMES": self._GetVulkanIcdFile(), + "VK_LOADER_DEBUG": "info,error", + } + env.update(aemu_logging_env) + return env |