diff options
Diffstat (limited to 'chrome/chrome_resources.gyp')
| -rw-r--r-- | chrome/chrome_resources.gyp | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index fc15532..be4fb16 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -11,7 +11,7 @@ 'target_name': 'chrome_extra_resources', 'type': 'none', 'dependencies': [ - '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:generate_devtools_grd', + '../content/browser/debugger/devtools_resources.gyp:devtools_resources', ], # These resources end up in resources.pak because they are resources # used by internal pages. Putting them in a spearate pak file makes @@ -74,39 +74,13 @@ 'includes': [ '../build/grit_action.gypi' ], }, { - 'action_name': 'devtools_frontend_resources', + 'action_name': 'devtools_discovery_page_resources', 'variables': { 'grit_grd_file': - 'browser/debugger/frontend/devtools_frontend_resources.grd', + 'browser/debugger/frontend/devtools_discovery_page_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' ], }, |