diff options
| author | jamescook <jamescook@chromium.org> | 2014-10-29 18:31:35 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-30 01:31:58 +0000 |
| commit | ccffe0eebe798b78879894d5ee08dbca10f28a33 (patch) | |
| tree | 6f374ef6f1811e536702b334cd25c0f9bcdd6bae /extensions/extensions.gyp | |
| parent | ae184e951d2dc91e821a12aebe62e19c006b3bcf (diff) | |
| download | chromium_src-ccffe0eebe798b78879894d5ee08dbca10f28a33.zip chromium_src-ccffe0eebe798b78879894d5ee08dbca10f28a33.tar.gz chromium_src-ccffe0eebe798b78879894d5ee08dbca10f28a33.tar.bz2 | |
app_shell: Fix crash when using devtools remote debugging
app_shell was missing blink_resources.pak so the remote debugging code
could not inject InjectedScriptSource.js
This patch does not significantly increase the size of the
app_shell .pak file -- it's still < 6 MB.
BUG=428166
TEST=manual, see bug
Review URL: https://codereview.chromium.org/689833002
Cr-Commit-Position: refs/heads/master@{#302009}
Diffstat (limited to 'extensions/extensions.gyp')
| -rw-r--r-- | extensions/extensions.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index 31868ec..d151403 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -1069,11 +1069,10 @@ 'target_name': 'extensions_shell_and_test_pak', 'type': 'none', 'dependencies': [ - # Need dev-tools related resources in shell_resources.pak and - # devtools_resources.pak. '../content/browser/devtools/devtools_resources.gyp:devtools_resources', '../content/content.gyp:content_resources', '../content/content_shell_and_tests.gyp:content_shell_resources', + '../third_party/WebKit/public/blink_resources.gyp:blink_resources', '../ui/resources/ui_resources.gyp:ui_resources', '../ui/strings/ui_strings.gyp:ui_strings', 'extensions_resources.gyp:extensions_resources', @@ -1085,6 +1084,7 @@ 'action_name': 'repack_extensions_shell_and_test_pak', 'variables': { 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak', |