summaryrefslogtreecommitdiffstats
path: root/webkit/webkit_resources.gyp
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 15:48:16 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 15:48:16 +0000
commit5c586489b82900dfd5a12a158d5a23634defe54a (patch)
tree0b0aaf50ca061063d3f4b40f3a03d0f6537621fb /webkit/webkit_resources.gyp
parent08be10fd1984246b651d41ce759a5e189ecea439 (diff)
downloadchromium_src-5c586489b82900dfd5a12a158d5a23634defe54a.zip
chromium_src-5c586489b82900dfd5a12a158d5a23634defe54a.tar.gz
chromium_src-5c586489b82900dfd5a12a158d5a23634defe54a.tar.bz2
Switch Chromium to use Blink's blink_resources.grd
WebKit.grd is deprecated, so we update it public/blink_resources.grd. R=darin@chromium.org, joth@chromium.org, thestig@chromium.org Review URL: https://codereview.chromium.org/19537010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit_resources.gyp')
-rw-r--r--webkit/webkit_resources.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/webkit_resources.gyp b/webkit/webkit_resources.gyp
index 3d486e9..8ce53a7 100644
--- a/webkit/webkit_resources.gyp
+++ b/webkit/webkit_resources.gyp
@@ -21,7 +21,7 @@
{
'action_name': 'blink_chromium_resources',
'variables': {
- 'grit_grd_file': '../third_party/WebKit/Source/WebKit/chromium/WebKit.grd',
+ 'grit_grd_file': '../third_party/WebKit/public/blink_resources.grd',
},
'includes': [ '../build/grit_action.gypi' ],
},