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 | |
| 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
| -rw-r--r-- | app/app.gyp | 3 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 3 | ||||
| -rw-r--r-- | chrome/default_plugin/default_plugin.gyp | 3 | ||||
| -rw-r--r-- | gfx/gfx.gyp | 3 | ||||
| -rw-r--r-- | net/net.gyp | 3 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 3 |
6 files changed, 12 insertions, 6 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': [ diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 84d4446..5095499 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -64,7 +64,8 @@ 'browser/resources/net_internals_resources.grd', 'browser/resources/shared_resources.grd' ], - 'grit_info_cmd': ['python', '../tools/grit/grit_info.py'], + 'grit_info_cmd': ['python', '../tools/grit/grit_info.py', + '<@(grit_defines)'], 'grit_cmd': ['python', '../tools/grit/grit.py'], 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], # TODO: remove this helper when we have loops in GYP diff --git a/chrome/default_plugin/default_plugin.gyp b/chrome/default_plugin/default_plugin.gyp index e82f15e..3af4a66 100644 --- a/chrome/default_plugin/default_plugin.gyp +++ b/chrome/default_plugin/default_plugin.gyp @@ -5,7 +5,8 @@ { 'variables': { '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)/chrome', 'grit_cmd': ['python', '../../tools/grit/grit.py'], }, diff --git a/gfx/gfx.gyp b/gfx/gfx.gyp index c24e5a0..824e9b0 100644 --- a/gfx/gfx.gyp +++ b/gfx/gfx.gyp @@ -5,7 +5,8 @@ { 'variables': { 'chromium_code': 1, - 'grit_info_cmd': ['python', '../tools/grit/grit_info.py'], + 'grit_info_cmd': ['python', '../tools/grit/grit_info.py', + '<@(grit_defines)'], 'grit_cmd': ['python', '../tools/grit/grit.py'], 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/gfx', }, 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', ], 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': [ |