From b32ddd664e79c41b7b7811e834a20895fb0fcde3 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 8 Jun 2018 13:47:30 +0200 Subject: Do not depend on pywin32 This code worked around a windows kernel bug triggered by ldd, but we don't use ldd. Change-Id: Ib5fe8e0a40766c129cd8d106a78aaf58888b8b25 Reviewed-by: Allan Sandfeld Jensen Reviewed-by: Peter Varga --- chromium/build/toolchain/win/tool_wrapper.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chromium/build/toolchain/win/tool_wrapper.py b/chromium/build/toolchain/win/tool_wrapper.py index 350fd6a8199..aa6b3bc4899 100644 --- a/chromium/build/toolchain/win/tool_wrapper.py +++ b/chromium/build/toolchain/win/tool_wrapper.py @@ -23,10 +23,12 @@ import sys # if it finds versions with a different bitness first then win32file.pyd will # fail to load with a cryptic error: # ImportError: DLL load failed: %1 is not a valid Win32 application. +""" if sys.platform == 'win32': os.environ['PATH'] = os.path.dirname(sys.executable) + \ os.pathsep + os.environ['PATH'] import win32file # pylint: disable=import-error +""" BASE_DIR = os.path.dirname(os.path.abspath(__file__)) @@ -183,6 +185,7 @@ class WinTool(object): result = link.wait() if not retry: break + """ if result == 0 and sys.platform == 'win32': # Flush the file buffers to try to work around a Windows 10 kernel bug, # https://crbug.com/644525 @@ -190,6 +193,7 @@ class WinTool(object): 0, None, win32file.OPEN_EXISTING, 0, 0) win32file.FlushFileBuffers(output_handle) output_handle.Close() + """ return result def ExecAsmWrapper(self, arch, *args): -- cgit v1.2.3