diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 16:35:02 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 16:35:02 +0000 |
| commit | 232af45a7873f844a544e4f1fa1cf33222da7490 (patch) | |
| tree | b5e68cfa346439085b37c373f8b5eaae3b905a1f /build | |
| parent | 547bfbb040c71ac0e02061994ca2c22950a7e84e (diff) | |
| download | chromium_src-232af45a7873f844a544e4f1fa1cf33222da7490.zip chromium_src-232af45a7873f844a544e4f1fa1cf33222da7490.tar.gz chromium_src-232af45a7873f844a544e4f1fa1cf33222da7490.tar.bz2 | |
Use a qualified path to blink resources, content part.
This should prevent problems such as described in
[chromium-dev] PSA: clobber build needed for IDR_INSPECTOR_*
compile errors in blink_platform_impl.cc
Depends on https://codereview.chromium.org/431883002
BUG=400860
TBR=brettw
Review URL: https://codereview.chromium.org/430083002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/secondary/tools/grit/grit_rule.gni | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build/secondary/tools/grit/grit_rule.gni b/build/secondary/tools/grit/grit_rule.gni index 64d542a..e27f914 100644 --- a/build/secondary/tools/grit/grit_rule.gni +++ b/build/secondary/tools/grit/grit_rule.gni @@ -41,6 +41,9 @@ # output_dir (optional) # Directory for generated files. # +# use_qualified_include (optional) +# If set, output_dir is not added to include_dirs. +# # deps (optional) # visibility (optional) # Normal meaning. @@ -247,7 +250,10 @@ template("grit") { # (like "mycomponent/foo.h"). This config sets up the include path. grit_config = target_name + "_grit_config" config(grit_config) { - include_dirs = [ output_dir ] + if (!defined(invoker.use_qualified_include) || + !invoker.use_qualified_include) { + include_dirs = [ output_dir ] + } visibility = target_visibility } |