diff options
| author | mek@chromium.org <mek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-03 17:39:35 +0000 |
|---|---|---|
| committer | mek@chromium.org <mek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-03 17:39:35 +0000 |
| commit | b155037ce9ddda46e7260c94bd8cfccdc9fc6404 (patch) | |
| tree | 7fc1978187caef0f7708d1d937388ca56b83154d /apps/shell | |
| parent | 3187667bcd4a04b4a619e7c63171c9a71a3d335d (diff) | |
| download | chromium_src-b155037ce9ddda46e7260c94bd8cfccdc9fc6404.zip chromium_src-b155037ce9ddda46e7260c94bd8cfccdc9fc6404.tar.gz chromium_src-b155037ce9ddda46e7260c94bd8cfccdc9fc6404.tar.bz2 | |
Revert 274558 "Move some extensions renderer resources to extens..."
This broke various builds (http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win%20Builder/builds/54738/steps/runhooks/logs/stdio for example) since chrome_renderer.gypi (and maybe other files) still have refernces to the old location of these resources.
> Move some extensions renderer resources to extensions_renderer_resources.grd.
>
> This breaks the remaining dependency from src/extensions to chrome resources files.
>
> BUG=368334
>
> Review URL: https://codereview.chromium.org/307833002
TBR=yoz@chromium.org
Review URL: https://codereview.chromium.org/309413002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274565 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/shell')
| -rw-r--r-- | apps/shell/app_shell.gyp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/shell/app_shell.gyp b/apps/shell/app_shell.gyp index bd5b26a..fd1295e 100644 --- a/apps/shell/app_shell.gyp +++ b/apps/shell/app_shell.gyp @@ -51,7 +51,6 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_renderer_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/extensions/strings/extensions_strings_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak', |