mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 111.0.5563.0 (#1097615)
This commit is contained in:
@ -1,8 +1,8 @@
|
||||
diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py
|
||||
index 112690a7f7ad3..6c65b68b171ab 100644
|
||||
index 026bcc96c3439..cbc827b27a0ba 100644
|
||||
--- build/toolchain/win/setup_toolchain.py
|
||||
+++ build/toolchain/win/setup_toolchain.py
|
||||
@@ -166,13 +166,17 @@ def _LoadToolchainEnv(cpu, toolchain_root, sdk_dir, target_store):
|
||||
@@ -165,13 +165,17 @@ def _LoadToolchainEnv(cpu, toolchain_root, sdk_dir, target_store):
|
||||
del os.environ['LIB']
|
||||
if 'LIBPATH' in os.environ:
|
||||
del os.environ['LIBPATH']
|
||||
@ -26,10 +26,10 @@ index 112690a7f7ad3..6c65b68b171ab 100644
|
||||
if (cpu != 'x64'):
|
||||
# x64 is default target CPU thus any other CPU requires a target set
|
||||
diff --git build/vs_toolchain.py build/vs_toolchain.py
|
||||
index d426fcd842c16..cc85b09f19579 100755
|
||||
index 6ca0be49fe8ed..28e134716c116 100755
|
||||
--- build/vs_toolchain.py
|
||||
+++ build/vs_toolchain.py
|
||||
@@ -107,9 +107,16 @@ def SetEnvironmentAndGetRuntimeDllDirs():
|
||||
@@ -106,9 +106,16 @@ def SetEnvironmentAndGetRuntimeDllDirs():
|
||||
runtime_path = os.path.pathsep.join(vs_runtime_dll_dirs)
|
||||
os.environ['PATH'] = runtime_path + os.path.pathsep + os.environ['PATH']
|
||||
elif sys.platform == 'win32' and not depot_tools_win_toolchain:
|
||||
@ -46,7 +46,7 @@ index d426fcd842c16..cc85b09f19579 100755
|
||||
# When using an installed toolchain these files aren't needed in the output
|
||||
# directory in order to run binaries locally, but they are needed in order
|
||||
# to create isolates or the mini_installer. Copying them to the output
|
||||
@@ -158,6 +165,10 @@ def _RegistryGetValue(key, value):
|
||||
@@ -157,6 +164,10 @@ def _RegistryGetValue(key, value):
|
||||
def GetVisualStudioVersion():
|
||||
"""Return best available version of Visual Studio.
|
||||
"""
|
||||
@ -57,7 +57,7 @@ index d426fcd842c16..cc85b09f19579 100755
|
||||
supported_versions = list(MSVS_VERSIONS.keys())
|
||||
|
||||
# VS installed in depot_tools for Googlers
|
||||
@@ -431,7 +442,7 @@ def _CopyDebugger(target_dir, target_cpu):
|
||||
@@ -430,7 +441,7 @@ def _CopyDebugger(target_dir, target_cpu):
|
||||
|
||||
# List of debug files that should be copied, the first element of the tuple is
|
||||
# the name of the file and the second indicates if it's optional.
|
||||
|
Reference in New Issue
Block a user