summaryrefslogtreecommitdiffstats
path: root/content/browser/tracing/tracing_resources.gyp
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-28 07:41:03 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-28 07:41:03 +0000
commit3e42ad4c4b41ee5f86179ebe92b305cb739812b5 (patch)
tree63257c6eab12947894a368ce8aedc6b1fdb66732 /content/browser/tracing/tracing_resources.gyp
parent22743cdf48a468f44382eb115c847a1cb5a36f5c (diff)
downloadchromium_src-3e42ad4c4b41ee5f86179ebe92b305cb739812b5.zip
chromium_src-3e42ad4c4b41ee5f86179ebe92b305cb739812b5.tar.gz
chromium_src-3e42ad4c4b41ee5f86179ebe92b305cb739812b5.tar.bz2
Take grit_rc_header_format into account in grit actions that don't use build/grit_action.gypi.
BUG=338759 TBR=nduca@chromium.org Review URL: https://codereview.chromium.org/250903002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266476 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/tracing/tracing_resources.gyp')
-rw-r--r--content/browser/tracing/tracing_resources.gyp4
1 files changed, 3 insertions, 1 deletions
diff --git a/content/browser/tracing/tracing_resources.gyp b/content/browser/tracing/tracing_resources.gyp
index 0684575..7ad5b96 100644
--- a/content/browser/tracing/tracing_resources.gyp
+++ b/content/browser/tracing/tracing_resources.gyp
@@ -55,6 +55,7 @@
'variables': {
'grit_cmd': ['python', '../../../tools/grit/grit.py'],
'grit_grd_file': '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd',
+ 'grit_rc_header_format%': '',
},
'inputs': [
'<(grit_grd_file)',
@@ -69,7 +70,8 @@
'-f', '<(DEPTH)/tools/gritsettings/resource_ids',
'-o', '<(grit_out_dir)',
'-D', 'SHARED_INTERMEDIATE_DIR=<(SHARED_INTERMEDIATE_DIR)',
- '<@(grit_defines)' ],
+ '<@(grit_defines)',
+ '<@(grit_rc_header_format)'],
'message': 'Generating resources from <(grit_grd_file)',
}
],