summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webkit_glue.gypi
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-08 01:07:52 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-08 01:07:52 +0000
commitb15b5e32959926441c298a89c843293c52de75e2 (patch)
tree81efc081da979da1601357b0d60cd9e742ada2ef /webkit/glue/webkit_glue.gypi
parent619424704868b6f462226fd1dc812a8aaa090350 (diff)
downloadchromium_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 'webkit/glue/webkit_glue.gypi')
-rw-r--r--webkit/glue/webkit_glue.gypi3
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 181ea91..697ca8f 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -12,7 +12,8 @@
}],
],
- 'grit_info_cmd': ['python', '<(DEPTH)/tools/grit/grit_info.py'],
+ 'grit_info_cmd': ['python', '<(DEPTH)/tools/grit/grit_info.py',
+ '<@(grit_defines)'],
'grit_cmd': ['python', '<(DEPTH)/tools/grit/grit.py'],
},
'targets': [