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

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

Issue 1183633003: cross gn Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: slightly smaller diff Created 4 years, 5 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 | « build/config/BUILDCONFIG.gn ('k') | build/secondary/third_party/crashpad/crashpad/util/BUILD.gn » ('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..b1f935d7b7fc93dfca235fa5496faf15600a9240 100644
--- a/build/config/win/manifest.gni
+++ b/build/config/win/manifest.gni
@@ -76,7 +76,7 @@ require_administrator_manifest = "//build/win/require_administrator.manifest"
# ...
# }
-if (is_win) {
+if (is_win && host_os == "win") { # XXX
# This is the environment file that gyp-win-tool 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
@@ -160,7 +160,7 @@ if (is_win) {
# updated every time the manifest is updated. Otherwise, updating the
# manifest will not cause a recompilation of the .rc file.
deps = [
- ":$manifest_action_name",
+ #":$manifest_action_name",
]
}
@@ -171,8 +171,8 @@ if (is_win) {
rcfile,
]
deps = [
- ":$manifest_action_name",
- ":$rc_action_name",
+ #":$manifest_action_name",
+ #":$rc_action_name",
]
}
}
« no previous file with comments | « build/config/BUILDCONFIG.gn ('k') | build/secondary/third_party/crashpad/crashpad/util/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698