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

Unified Diff: build/config/win/manifest.gni

Issue 2286413002: Move gyp-win-tool to the GN Windows toolchain. (Closed)
Patch Set: fix Created 4 years, 4 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
« no previous file with comments | « no previous file | build/toolchain/toolchain.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/win/manifest.gni
diff --git a/build/config/win/manifest.gni b/build/config/win/manifest.gni
index 3dcaddfb3bccd8369ddc1b044dac95ee3c5771b2..515764c53111afe929200713bdf84fcdced2d085 100644
--- a/build/config/win/manifest.gni
+++ b/build/config/win/manifest.gni
@@ -77,10 +77,10 @@ require_administrator_manifest = "//build/win/require_administrator.manifest"
# }
if (is_win) {
- # This is the environment file that gyp-win-tool will use for the current
+ # This is the environment file that tool_wrapper.py will use for the current
# toolchain. It is placed in root_build_dir by the toolchain setup. This
# variable is the path relative to the root_build_dir which is what
- # gyp-win-tool expects as an argument.
+ # tool_wrapper.py expects as an argument.
_environment_file = "environment.$current_cpu"
template("windows_manifest") {
@@ -98,7 +98,7 @@ if (is_win) {
":$rc_action_name",
]
- script = "$root_build_dir/gyp-win-tool"
+ script = "//build/toolchain/win/tool_wrapper.py"
assert(defined(invoker.sources),
"\"sources\" must be defined for a windows_manifest target")
@@ -126,11 +126,11 @@ if (is_win) {
# Make the .rc file that references the final manifest file.
#
# This could easily be combined into one step, but this current separation
- # of .manifest and .rc matches GYP and allows us to re-use gyp-win-tool.
+ # of .manifest and .rc matches GYP and allows us to re-use tool_wrapper.py.
action(rc_action_name) {
visibility = [ ":$source_set_name" ]
- script = "$root_build_dir/gyp-win-tool"
+ script = "//build/toolchain/win/tool_wrapper.py"
outputs = [
rcfile,
« no previous file with comments | « no previous file | build/toolchain/toolchain.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698