summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_dll.gypi
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-11 02:03:47 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-11 02:03:47 +0000
commit2cc098e42e7b46513687c210de4bacbae4009ec3 (patch)
tree4a3e26216656218e428880bd6f28d1ab8f9eae18 /chrome/chrome_dll.gypi
parent19efc6bed985bff75f74652ea0583503809f66ff (diff)
downloadchromium_src-2cc098e42e7b46513687c210de4bacbae4009ec3.zip
chromium_src-2cc098e42e7b46513687c210de4bacbae4009ec3.tar.gz
chromium_src-2cc098e42e7b46513687c210de4bacbae4009ec3.tar.bz2
Move devtool resources from webkit_resources.grd to an upstream grd file.
This gets rid of third_party references in webkit_resources.grd which will allow us to build this file upstream. Review URL: http://codereview.chromium.org/792005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
-rw-r--r--chrome/chrome_dll.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index a2ef72c..b2ae258 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -219,6 +219,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
# TODO(sgk): left-over from pre-gyp build, figure out
@@ -394,6 +395,7 @@
'<(grit_out_dir)/theme_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
],
},