diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 16:31:39 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 16:31:39 +0000 |
| commit | f7041fab959f6c806f8e7805f93f799a00091f8f (patch) | |
| tree | e8954ad3601d82358c88ee0e0a618c70077b9b83 /build/grit_target.gypi | |
| parent | 44c49c9f1e003331995f06b79f43138b4264f8ed (diff) | |
| download | chromium_src-f7041fab959f6c806f8e7805f93f799a00091f8f.zip chromium_src-f7041fab959f6c806f8e7805f93f799a00091f8f.tar.gz chromium_src-f7041fab959f6c806f8e7805f93f799a00091f8f.tar.bz2 | |
Grit cleanup
- Fixup the chrome_strings target to default to a none target and let windows
override it for it's hack.
- Make grit_target check _type to see how to auto add the header directory so
it has a higher chance of being right in case things are done on real targets.
BUG=22247
TEST=everything still builds
Review URL: http://codereview.chromium.org/6756008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/grit_target.gypi')
| -rw-r--r-- | build/grit_target.gypi | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/build/grit_target.gypi b/build/grit_target.gypi index c8998e1..5912d48 100644 --- a/build/grit_target.gypi +++ b/build/grit_target.gypi @@ -10,12 +10,22 @@ # NOTE: This file is optional, not all targets that use grit include it, some # do their own custom directives instead. { - 'direct_dependent_settings': { - 'include_dirs': [ - '<(grit_out_dir)', - ], - }, 'conditions': [ + # If the target is a direct binary, it needs to be able to find the header, + # otherwise it probably a supporting target just for grit so the include + # dir needs to be set on anything that depends on this action. + ['_type=="executable" or _type=="shared_library" or \ + _type=="loadable_module" or _type=="static_library"', { + 'include_dirs': [ + '<(grit_out_dir)', + ], + }, { + 'direct_dependent_settings': { + 'include_dirs': [ + '<(grit_out_dir)', + ], + }, + }], ['OS=="win"', { 'dependencies': ['<(DEPTH)/build/win/system.gyp:cygwin'], }], |