diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-08 01:07:52 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-08 01:07:52 +0000 |
| commit | b15b5e32959926441c298a89c843293c52de75e2 (patch) | |
| tree | 81efc081da979da1601357b0d60cd9e742ada2ef /net/net.gyp | |
| parent | 619424704868b6f462226fd1dc812a8aaa090350 (diff) | |
| download | chromium_src-b15b5e32959926441c298a89c843293c52de75e2.zip chromium_src-b15b5e32959926441c298a89c843293c52de75e2.tar.gz chromium_src-b15b5e32959926441c298a89c843293c52de75e2.tar.bz2 | |
Fix grit dependencies for chromeos, touchui, and toolkit_views.
We weren't passing in the grit defines to grit_info.py, so we
weren't getting the dependencies behind <if> blocks included
in the Makefile.
BUG=68028
Review URL: http://codereview.chromium.org/6109003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/net.gyp b/net/net.gyp index 96ddb61..649544a 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1205,7 +1205,8 @@ 'msvs_guid': '8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942', 'variables': { 'grit_cmd': ['python', '../tools/grit/grit.py'], - 'grit_info_cmd': ['python', '../tools/grit/grit_info.py'], + 'grit_info_cmd': ['python', '../tools/grit/grit_info.py', + '<@(grit_defines)'], 'input_paths': [ 'base/net_resources.grd', ], |