diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 22:48:59 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 22:48:59 +0000 |
| commit | 3a740b30a7ada4266cae5a1a5658e850dd663e22 (patch) | |
| tree | 02fe685b5b5c8f7ed26d837ff602700d26fa82e4 /chrome | |
| parent | cbc0e9cc6651df9bb4a256c30c7d4a8fce36d066 (diff) | |
| download | chromium_src-3a740b30a7ada4266cae5a1a5658e850dd663e22.zip chromium_src-3a740b30a7ada4266cae5a1a5658e850dd663e22.tar.gz chromium_src-3a740b30a7ada4266cae5a1a5658e850dd663e22.tar.bz2 | |
Specify all the outputs of theme_resources.grd-- it outputs
an extra .h and .cc file.
This means I have to split it into it's own action since the other
grd files don't create this output.
This fixes a dependency in the make build.
Review URL: http://codereview.chromium.org/99362
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.gyp | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index bf4494b..7d5f696 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -61,7 +61,6 @@ ], 'sources': [ # Data resources. - 'app/theme/theme_resources.grd', 'browser/debugger/resources/debugger_resources.grd', 'browser/browser_resources.grd', 'common/common_resources.grd', @@ -109,6 +108,40 @@ }, }, { + # theme_resources also generates a .cc file, so it can't use the rules above. + 'target_name': 'theme_resources', + 'type': 'none', + 'variables': { + 'grit_path': '../tools/grit/grit.py', + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', + }, + 'actions': [ + { + 'action_name': 'theme_resources', + 'variables': { + 'input_path': 'app/theme/theme_resources.grd', + }, + 'inputs': [ + '<(input_path)', + ], + 'outputs': [ + '<(grit_out_dir)/grit/theme_resources.h', + '<(grit_out_dir)/grit/theme_resources_map.cc', + '<(grit_out_dir)/grit/theme_resources_map.h', + '<(grit_out_dir)/theme_resources.pak', + '<(grit_out_dir)/theme_resources.rc', + ], + 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'], + 'message': 'Generating resources from <(input_path)', + }, + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)/chrome', + ], + }, + }, + { 'target_name': 'common', 'type': '<(library)', 'dependencies': [ @@ -398,6 +431,7 @@ 'common', 'chrome_resources', 'chrome_strings', + 'theme_resources', '../media/media.gyp:media', '../net/net.gyp:net_resources', '../skia/skia.gyp:skia', @@ -2743,6 +2777,7 @@ 'common', 'chrome_resources', 'chrome_strings', + 'theme_resources', '../media/media.gyp:media', '../skia/skia.gyp:skia', '../third_party/icu38/icu38.gyp:icui18n', |