diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 13:10:41 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 13:10:41 +0000 |
| commit | 4cc1c1f9a9d19b5988dc01ac4e6fc693b0e03ec1 (patch) | |
| tree | 42c1c1fc46e44813c71c7611e1acac1b524b1090 /chrome/chrome_resources.gyp | |
| parent | 9b59a69ff861f502b0cb17e0f2f990f068677ce5 (diff) | |
| download | chromium_src-4cc1c1f9a9d19b5988dc01ac4e6fc693b0e03ec1.zip chromium_src-4cc1c1f9a9d19b5988dc01ac4e6fc693b0e03ec1.tar.gz chromium_src-4cc1c1f9a9d19b5988dc01ac4e6fc693b0e03ec1.tar.bz2 | |
This reverts r119230 that broke few builders.
TBR=yurys
Review URL: https://chromiumcodereview.appspot.com/9234061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119231 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_resources.gyp')
| -rw-r--r-- | chrome/chrome_resources.gyp | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index be4fb16..fc15532 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -11,7 +11,7 @@ 'target_name': 'chrome_extra_resources', 'type': 'none', 'dependencies': [ - '../content/browser/debugger/devtools_resources.gyp:devtools_resources', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:generate_devtools_grd', ], # These resources end up in resources.pak because they are resources # used by internal pages. Putting them in a spearate pak file makes @@ -74,13 +74,39 @@ 'includes': [ '../build/grit_action.gypi' ], }, { - 'action_name': 'devtools_discovery_page_resources', + 'action_name': 'devtools_frontend_resources', 'variables': { 'grit_grd_file': - 'browser/debugger/frontend/devtools_discovery_page_resources.grd', + 'browser/debugger/frontend/devtools_frontend_resources.grd', }, 'includes': [ '../build/grit_action.gypi' ] }, + { + 'action_name': 'devtools_resources', + # This can't use ../build/grit_action.gypi because the grd file + # is generated a build time, so the trick of using grit_info to get + # the real inputs/outputs at GYP time isn't possible. + 'variables': { + 'grit_cmd': ['python', '../tools/grit/grit.py'], + 'grit_grd_file': '<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd', + }, + 'inputs': [ + '<(grit_grd_file)', + '<!@pymod_do_main(grit_info --inputs)', + ], + 'outputs': [ + '<(grit_out_dir)/grit/devtools_resources.h', + '<(grit_out_dir)/devtools_resources.pak', + '<(grit_out_dir)/grit/devtools_resources_map.cc', + '<(grit_out_dir)/grit/devtools_resources_map.h', + ], + 'action': ['<@(grit_cmd)', + '-i', '<(grit_grd_file)', 'build', + '-o', '<(grit_out_dir)', + '-D', 'SHARED_INTERMEDIATE_DIR=<(SHARED_INTERMEDIATE_DIR)', + '<@(grit_defines)' ], + 'message': 'Generating resources from <(grit_grd_file)', + }, ], 'includes': [ '../build/grit_target.gypi' ], }, |