Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Side by Side Diff: build/toolchain/win/BUILD.gn

Issue 204663004: Use depot_tools toolchain, remove now unneeded code, fix not including path to win sdk tools (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use depot_tools toolchain, remove now unneeded code, fix not including path to win sdk tools Created 6 years, 9 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/toolchain/goma.gni") 5 import("//build/toolchain/goma.gni")
6 6
7 # Should only be running on Windows. 7 # Should only be running on Windows.
8 assert(is_win) 8 assert(is_win)
9 9
10 import("//build/config/win/visual_studio_version.gni") 10 import("//build/config/win/visual_studio_version.gni")
11 11
12 # Setup the Visual Studio state. 12 # Setup the Visual Studio state.
13 # 13 #
14 # Its arguments are the VS path and the compiler wrapper tool. It will write 14 # Its arguments are the VS path and the compiler wrapper tool. It will write
15 # "environment.x86" and "environment.x64" to the build directory and return a 15 # "environment.x86" and "environment.x64" to the build directory and return a
16 # list to us. 16 # list to us.
17 gyp_win_tool_path = rebase_path("//tools/gyp/pylib/gyp/win_tool.py", 17 gyp_win_tool_path = rebase_path("//tools/gyp/pylib/gyp/win_tool.py",
18 root_build_dir) 18 root_build_dir)
19 exec_script("setup_toolchain.py", [ visual_studio_path, gyp_win_tool_path ], 19 exec_script("setup_toolchain.py",
20 [ visual_studio_path, gyp_win_tool_path, windows_sdk_path ],
20 "string") 21 "string")
21 22
22 stamp_command = "$python_path gyp-win-tool stamp \$out" 23 stamp_command = "$python_path gyp-win-tool stamp \$out"
23 copy_command = "$python_path gyp-win-tool recursive-mirror \$in \$out" 24 copy_command = "$python_path gyp-win-tool recursive-mirror \$in \$out"
24 25
25 if (use_goma) { 26 if (use_goma) {
26 # Add the Goma compiler prefixes to the GYP file. 27 # Add the Goma compiler prefixes to the GYP file.
27 gyp_header = "'make_global_settings': [ $make_goma_global_settings ]," 28 gyp_header = "'make_global_settings': [ $make_goma_global_settings ],"
28 } 29 }
29 30
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 147
147 # When invoking this toolchain not as the default one, these args will be 148 # When invoking this toolchain not as the default one, these args will be
148 # passed to the build. They are ignored when this is the default toolchain. 149 # passed to the build. They are ignored when this is the default toolchain.
149 toolchain_args() { 150 toolchain_args() {
150 cpu_arch = "x64" 151 cpu_arch = "x64"
151 # Normally the build config resets the CPU architecture to 32-bits. Setting 152 # Normally the build config resets the CPU architecture to 32-bits. Setting
152 # this flag overrides that behavior. 153 # this flag overrides that behavior.
153 force_win64 = true 154 force_win64 = true
154 } 155 }
155 } 156 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698