summaryrefslogtreecommitdiffstats
path: root/extensions/DEPS
diff options
context:
space:
mode:
authormek@chromium.org <mek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-03 17:39:35 +0000
committermek@chromium.org <mek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-03 17:39:35 +0000
commitb155037ce9ddda46e7260c94bd8cfccdc9fc6404 (patch)
tree7fc1978187caef0f7708d1d937388ca56b83154d /extensions/DEPS
parent3187667bcd4a04b4a619e7c63171c9a71a3d335d (diff)
downloadchromium_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 'extensions/DEPS')
-rw-r--r--extensions/DEPS4
1 files changed, 3 insertions, 1 deletions
diff --git a/extensions/DEPS b/extensions/DEPS
index d762dc4..f919975 100644
--- a/extensions/DEPS
+++ b/extensions/DEPS
@@ -2,7 +2,6 @@ include_rules = [
"+components/url_matcher",
"+content/public/common",
"+crypto",
- "+grit/extensions_renderer_resources.h",
"+grit/extensions_resources.h",
"+testing",
"+ui",
@@ -14,6 +13,9 @@ include_rules = [
#
# TODO(jamescook): Remove these. http://crbug.com/162530
"!chrome/browser/chrome_notification_types.h",
+ # This is needed for renderer JS sources which should eventually move to
+ # the extensions_resources target.
+ "!grit/renderer_resources.h",
]
specific_include_rules = {