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 /chrome/chrome.gyp | |
| 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 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 7355282..75c1cd8 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -178,6 +178,7 @@ # generated headers. 'target_name': 'chrome_strings', 'msvs_guid': 'D9DDAF60-663F-49CC-90DC-3D08CC3D1B28', + 'type': 'none', 'conditions': [ ['OS=="win"', { # HACK(nsylvain): We want to enforce a fake dependency on @@ -188,8 +189,6 @@ # will always get built before installer_util. 'type': 'dummy_executable', 'dependencies': ['installer_util_strings'], - }, { - 'type': 'none', }], ], 'actions': [ |