summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-04 23:46:16 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-04 23:46:16 +0000
commit8f857ef8ff619a02e2318c120dcbb2263beaae30 (patch)
treed5c12ee644e1f0e80e32fdfdb3ebcd5f767a8357 /apps
parentef198a101f10c40b44c0397bd4f8a37c6ec51344 (diff)
downloadchromium_src-8f857ef8ff619a02e2318c120dcbb2263beaae30.zip
chromium_src-8f857ef8ff619a02e2318c120dcbb2263beaae30.tar.gz
chromium_src-8f857ef8ff619a02e2318c120dcbb2263beaae30.tar.bz2
Reland 274764 - Reland 274558 - Move some resources to extensions_renderer_resources.grd.
This patch fixes references in the .gyp to .js resource files (again). This breaks the remaining dependency from src/extensions to chrome resources files. BUG=368334 TBR=rockot@chromium.org,jam@chromium.org Review URL: https://codereview.chromium.org/312213002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
-rw-r--r--apps/shell/app_shell.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/shell/app_shell.gyp b/apps/shell/app_shell.gyp
index fd1295e..bd5b26a 100644
--- a/apps/shell/app_shell.gyp
+++ b/apps/shell/app_shell.gyp
@@ -51,6 +51,7 @@
'<(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',