diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-29 22:12:57 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-29 22:12:57 +0000 |
| commit | db8dc3fe00f6a33f2684379d30419767f9867997 (patch) | |
| tree | a05d1619e8bf538d81231131d689ff8d4fa0e684 /webkit/webkit_resources.gyp | |
| parent | a2024caea182c9c35b3aee8d5db4fd49706070a6 (diff) | |
| download | chromium_src-db8dc3fe00f6a33f2684379d30419767f9867997.zip chromium_src-db8dc3fe00f6a33f2684379d30419767f9867997.tar.gz chromium_src-db8dc3fe00f6a33f2684379d30419767f9867997.tar.bz2 | |
Include entries to blink_resources.
We can't remove entries of webkit_chromium_resources just yet, because on
Blink side DumpRenderTree is still using it through Chromium :(
TBR=abarth@chromium.org, joth@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/20329005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit_resources.gyp')
| -rw-r--r-- | webkit/webkit_resources.gyp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/webkit/webkit_resources.gyp b/webkit/webkit_resources.gyp index 3d486e9..50f795e 100644 --- a/webkit/webkit_resources.gyp +++ b/webkit/webkit_resources.gyp @@ -19,12 +19,19 @@ 'includes': [ '../build/grit_action.gypi' ], }, { - 'action_name': 'blink_chromium_resources', + 'action_name': 'webkit_chromium_resources', 'variables': { 'grit_grd_file': '../third_party/WebKit/Source/WebKit/chromium/WebKit.grd', }, 'includes': [ '../build/grit_action.gypi' ], }, + { + 'action_name': 'blink_chromium_resources', + 'variables': { + 'grit_grd_file': '../third_party/WebKit/public/blink_resources.grd', + }, + 'includes': [ '../build/grit_action.gypi' ], + }, ], 'includes': [ '../build/grit_target.gypi' ], 'direct_dependent_settings': { |