build/vs_toolchain.py - Issue 913373002: Update Chomium's build files to work w/ latest GN binaries.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/vs_toolchain.py

Issue 913373002: Update Chomium's build files to work w/ latest GN binaries. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn_cpu_arch_changes

Patch Set: merge to #317214 Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/vs_toolchain.py

diff --git a/build/vs_toolchain.py b/build/vs_toolchain.py

index 6f49e7c2e8e01692842537b0471b3583ae2a8c66..5b175eb13169af7dc7f9a51619052ce92fabf88c 100644

--- a/build/vs_toolchain.py

+++ b/build/vs_toolchain.py

@@ -129,11 +129,11 @@ def CopyVsRuntimeDlls(output_dir, runtime_dirs):

source_x64)

-def CopyDlls(target_dir, configuration, cpu_arch):

+def CopyDlls(target_dir, configuration, target_cpu):

"""Copy the VS runtime DLLs into the requested directory as needed.

configuration is one of 'Debug' or 'Release'.

- cpu_arch is one of 'x86' or 'x64'.

+ target_cpu is one of 'x86' or 'x64'.

The debug configuration gets both the debug and release DLLs; the

release config only the latter.

@@ -143,7 +143,7 @@ def CopyDlls(target_dir, configuration, cpu_arch):

return

x64_runtime, x86_runtime = vs2013_runtime_dll_dirs

- runtime_dir = x64_runtime if cpu_arch == 'x64' else x86_runtime

+ runtime_dir = x64_runtime if target_cpu == 'x64' else x86_runtime

_CopyRuntime(target_dir, runtime_dir, 'msvc%s120.dll')

if configuration == 'Debug':

_CopyRuntime(target_dir, runtime_dir, 'msvc%s120d.dll')

« no previous file with comments | « build/toolchain/win/setup_toolchain.py ('k') | chrome/BUILD.gn » ('j') | third_party/widevine/cdm/BUILD.gn » ('J')