diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-09 01:03:02 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-09 01:03:02 +0000 |
| commit | 5b910875d2500ac9d6c2516f15780e036bc6099a (patch) | |
| tree | 05cb78e1f2640a19c890bb143bb089135f4ae74e /net/net.gyp | |
| parent | e1151e9dcd127f075623d67935d80c1115b682e5 (diff) | |
| download | chromium_src-5b910875d2500ac9d6c2516f15780e036bc6099a.zip chromium_src-5b910875d2500ac9d6c2516f15780e036bc6099a.tar.gz chromium_src-5b910875d2500ac9d6c2516f15780e036bc6099a.tar.bz2 | |
Using grit_info to generate the complete set of inputs and outputs for
net_resources generated from a grd file.
This should make incremental rebuilds slightly more reliable.
Intentionally fixing this in one place only, in the hope of landing things
incrementally (and actually getting a fix in!).
BUG=19866
TEST=None
Review URL: http://codereview.chromium.org/587012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rwxr-xr-x | net/net.gyp | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/net/net.gyp b/net/net.gyp index 31e3dc4..15a1fc0 100755 --- a/net/net.gyp +++ b/net/net.gyp @@ -797,25 +797,33 @@ 'target_name': 'net_resources', 'type': 'none', 'msvs_guid': '8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942', + 'variables': { + 'grit_cmd': ['python', '../tools/grit/grit.py'], + 'grit_info_cmd': ['python', '../tools/grit/grit_info.py'], + 'input_paths': [ + 'base/net_resources.grd', + ], + }, 'rules': [ { 'rule_name': 'grit', 'extension': 'grd', 'inputs': [ - '../tools/grit/grit.py', + '<!@(<(grit_info_cmd) --inputs <(input_paths))', ], 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/net/grit/<(RULE_INPUT_ROOT).h', - '<(SHARED_INTERMEDIATE_DIR)/net/<(RULE_INPUT_ROOT).rc', - '<(SHARED_INTERMEDIATE_DIR)/net/<(RULE_INPUT_ROOT).pak', + '<!@(<(grit_info_cmd) ' + '--outputs \'<(SHARED_INTERMEDIATE_DIR)/net\' <(input_paths))', ], 'action': - ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/net'], + ['<@(grit_cmd)', + '-i', '<(RULE_INPUT_PATH)', 'build', + '-o', '<(SHARED_INTERMEDIATE_DIR)/net'], 'message': 'Generating resources from <(RULE_INPUT_PATH)', }, ], 'sources': [ - 'base/net_resources.grd', + '<@(input_paths)', ], 'direct_dependent_settings': { 'include_dirs': [ |