diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 02:52:22 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 02:52:22 +0000 |
| commit | e5f893b25b75168a7cabc12ec1a9459d7e78b3fe (patch) | |
| tree | 0478c8b1eecf0e3ddf8dc04d5f7bd8afc7e25d8f /webkit/webkit_resources.gyp | |
| parent | 3a0816fecc98fe7fc4b7b2f200ab9f3661bb1be2 (diff) | |
| download | chromium_src-e5f893b25b75168a7cabc12ec1a9459d7e78b3fe.zip chromium_src-e5f893b25b75168a7cabc12ec1a9459d7e78b3fe.tar.gz chromium_src-e5f893b25b75168a7cabc12ec1a9459d7e78b3fe.tar.bz2 | |
Reland "Include entries to blink_resources."
This was reverted in r214248 because it increased the size of chrome.pak.
R=abarth@chromium.org, joth@chromium.org, thestig@chromium.org,taysom@chromium.org
TBR=darin
Review URL: https://codereview.chromium.org/21121005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214294 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': { |