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 /app | |
| 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 'app')
| -rw-r--r-- | app/app.gyp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/app.gyp b/app/app.gyp index 1a40b50..f15b44d 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -7,7 +7,8 @@ # TODO: remove this helper when we have loops in GYP 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py',], 'chromium_code': 1, - 'grit_info_cmd': ['python', '../tools/grit/grit_info.py',], + 'grit_info_cmd': ['python', '../tools/grit/grit_info.py', + '<@(grit_defines)'], 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', 'grit_cmd': ['python', '../tools/grit/grit.py'], 'localizable_resources': [ |