Commit df5d8dad authored by Chong Gu's avatar Chong Gu Committed by Commit Bot

[Fuchsia] Avoid outputting emulator stderr to terminal.

Bug: 1096611
Change-Id: I8d7b3b2898fded0a805e8c4da784703c7e448180
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2252685Reviewed-by: default avatarKevin Marshall <kmarshall@chromium.org>
Commit-Queue: Chong Gu <chonggu@google.com>
Cr-Commit-Position: refs/heads/master@{#780066}
parent d4104883
...@@ -83,7 +83,6 @@ class AemuTarget(qemu_target.QemuTarget): ...@@ -83,7 +83,6 @@ class AemuTarget(qemu_target.QemuTarget):
def _SetEnv(self): def _SetEnv(self):
env = os.environ.copy() env = os.environ.copy()
aemu_logging_env = { aemu_logging_env = {
"ANDROID_EMU_VK_LOG_CALLS": "1",
"ANDROID_EMU_VK_NO_CLEANUP": "1", "ANDROID_EMU_VK_NO_CLEANUP": "1",
"ANDROID_EMUGL_LOG_PRINT": "1", "ANDROID_EMUGL_LOG_PRINT": "1",
"ANDROID_EMUGL_VERBOSE": "1", "ANDROID_EMUGL_VERBOSE": "1",
......
...@@ -61,11 +61,10 @@ class EmuTarget(target.Target): ...@@ -61,11 +61,10 @@ class EmuTarget(target.Target):
temporary_system_log_file = None temporary_system_log_file = None
if self._system_log_file: if self._system_log_file:
stdout = self._system_log_file stdout = self._system_log_file
stderr = subprocess.STDOUT
else: else:
temporary_system_log_file = tempfile.NamedTemporaryFile('w') temporary_system_log_file = tempfile.NamedTemporaryFile('w')
stdout = temporary_system_log_file stdout = temporary_system_log_file
stderr = sys.stderr stderr = subprocess.STDOUT
emu_env = self._SetEnv() emu_env = self._SetEnv()
self._emu_process = subprocess.Popen(emu_command, self._emu_process = subprocess.Popen(emu_command,
stdin=open(os.devnull), stdin=open(os.devnull),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment