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

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

Issue 1943103002: Recompile .rc files when manifests change in GN. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | no next file » | 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 285cf258d776683a8f748aeced5ec8db0e98173c..3dcaddfb3bccd8369ddc1b044dac95ee3c5771b2 100644
--- a/build/config/win/manifest.gni
+++ b/build/config/win/manifest.gni
@@ -93,7 +93,10 @@ if (is_win) {
# Make the final .manifest file.
action(manifest_action_name) {
- visibility = [ ":$source_set_name" ]
+ visibility = [
+ ":$source_set_name",
+ ":$rc_action_name",
+ ]
script = "$root_build_dir/gyp-win-tool"
@@ -120,9 +123,7 @@ if (is_win) {
forward_variables_from(invoker, [ "deps" ])
}
- # Make the .rc file that references the final manifest file. The manifest
- # generation doesn't need to be a dependency because it's not actually
- # needed until the .rc is compiled.
+ # 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.
@@ -153,6 +154,14 @@ if (is_win) {
rebase_path(rcfile, root_build_dir),
manifest_resource_id,
]
+
+ # Although generating this file doesn't technically depend on the
+ # generated manifest, this dependency causes the .rc timestamp to be
+ # updated every time the manifest is updated. Otherwise, updating the
+ # manifest will not cause a recompilation of the .rc file.
+ deps = [
+ ":$manifest_action_name",
+ ]
}
# This source set only exists to compile and link the resource file.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698