diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 09:14:18 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 09:14:18 +0000 |
| commit | c3a1faec09cc9ef07524cf1533ccb763c46a7109 (patch) | |
| tree | f5cb641439b78f1d0f2953c6c531f903c994595a /webkit/glue | |
| parent | dcafe8d8668f740d66e4d932684cda934339d980 (diff) | |
| download | chromium_src-c3a1faec09cc9ef07524cf1533ccb763c46a7109.zip chromium_src-c3a1faec09cc9ef07524cf1533ccb763c46a7109.tar.gz chromium_src-c3a1faec09cc9ef07524cf1533ccb763c46a7109.tar.bz2 | |
Revert 205463 "Split webkit_storage target into webkit_storage_{..."
Broke split_link
> Split webkit_storage target into webkit_storage_{browser,common,renderer}
>
> This does:
> - Remove all webkit/browser/foo/*.gypi, webkit/common/foo/*.gypi for storage
> - Add three top-level gyp's in webkit/: storage_{browser,common,renderer}.gyp
>
> storage_common and storage_renderer might be able to be subsumed in
> bigger targets for common|renderer, but believe we can do that later
> when necessary.
>
> BUG=239109
> TBR=mnaganov,thestig,avi
> NOTRY=true
>
> Review URL: https://chromiumcodereview.appspot.com/15716007
TBR=kinuko@chromium.org
Review URL: https://codereview.chromium.org/16365013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 31c211d..66a26b2 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -171,17 +171,16 @@ '<(DEPTH)/ui/ui.gyp:ui_resources', '<(DEPTH)/url/url.gyp:url_lib', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', - '<(DEPTH)/webkit/base/webkit_base.gyp:webkit_base', '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent', '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common', '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', - '<(DEPTH)/webkit/storage_browser.gyp:webkit_storage_browser', - '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common', 'glue_common', 'plugins', + 'webkit_base', 'webkit_common', 'webkit_media', 'webkit_resources', + 'webkit_storage', 'webkit_strings', ], 'include_dirs': [ |