diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 05:40:29 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 05:40:29 +0000 |
| commit | 002cc08fc2472a54222729082f0be64da4212495 (patch) | |
| tree | 2d4db929a2801368177f2ea1ac42f2873858f909 /webkit | |
| parent | 67e264aed134194e895af888f469ec869f20df99 (diff) | |
| download | chromium_src-002cc08fc2472a54222729082f0be64da4212495.zip chromium_src-002cc08fc2472a54222729082f0be64da4212495.tar.gz chromium_src-002cc08fc2472a54222729082f0be64da4212495.tar.bz2 | |
Roll DEPS for googleurl. Second try.
- Update all the references from build/temp_gyp/googleurl.gyp to url/url.gyp.
r184: Fix C++11 compilation on iOS
r185: Forward includes to url/
BUG=229660
R=thestig@chromium.org,brettw@chromium.org
TBR=darin@chromium.org
Review URL: https://chromiumcodereview.appspot.com/15421002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/base/webkit_base.gypi | 2 | ||||
| -rw-r--r-- | webkit/common/user_agent/webkit_user_agent.gyp | 1 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 6 | ||||
| -rw-r--r-- | webkit/plugins/webkit_plugins.gypi | 3 | ||||
| -rw-r--r-- | webkit/storage/webkit_storage.gypi | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/webkit/base/webkit_base.gypi b/webkit/base/webkit_base.gypi index 52521bdf0..bb5dfd2f 100644 --- a/webkit/base/webkit_base.gypi +++ b/webkit/base/webkit_base.gypi @@ -10,9 +10,9 @@ 'variables': { 'enable_wexit_time_destructors': 1, }, 'dependencies': [ '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', + '<(DEPTH)/url/url.gyp:url_lib', ], 'defines': ['WEBKIT_BASE_IMPLEMENTATION'], 'sources': [ diff --git a/webkit/common/user_agent/webkit_user_agent.gyp b/webkit/common/user_agent/webkit_user_agent.gyp index f94fe19..f1f0088 100644 --- a/webkit/common/user_agent/webkit_user_agent.gyp +++ b/webkit/common/user_agent/webkit_user_agent.gyp @@ -16,6 +16,7 @@ 'dependencies': [ '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base_i18n', + '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', ], 'sources': [ 'user_agent.cc', diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index cce64c3..7c993b5 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -64,15 +64,15 @@ 'WEBKIT_GLUE_IMPLEMENTATION', ], 'dependencies': [ - '<(DEPTH)/base/base.gyp:base_i18n', '<(DEPTH)/base/base.gyp:base', + '<(DEPTH)/base/base.gyp:base_i18n', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/ui/ui.gyp:ui', '<(DEPTH)/ui/ui.gyp:ui_resources', + '<(DEPTH)/url/url.gyp:url_lib', ], 'include_dirs': [ @@ -166,7 +166,6 @@ '<(DEPTH)/base/base.gyp:base_i18n', '<(DEPTH)/base/base.gyp:base_static', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', '<(DEPTH)/net/net.gyp:net', @@ -180,6 +179,7 @@ '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme', '<(DEPTH)/ui/ui.gyp:ui', '<(DEPTH)/ui/ui.gyp:ui_resources', + '<(DEPTH)/url/url.gyp:url_lib', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent', diff --git a/webkit/plugins/webkit_plugins.gypi b/webkit/plugins/webkit_plugins.gypi index cf17901..5c1ef0e 100644 --- a/webkit/plugins/webkit_plugins.gypi +++ b/webkit/plugins/webkit_plugins.gypi @@ -87,7 +87,6 @@ '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base_i18n', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', '<(DEPTH)/media/media.gyp:media', @@ -97,9 +96,11 @@ '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared', '<(DEPTH)/printing/printing.gyp:printing', '<(DEPTH)/skia/skia.gyp:skia', + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui', '<(DEPTH)/ui/ui.gyp:ui_resources', + '<(DEPTH)/url/url.gyp:url_lib', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent', diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi index 0fb1474..0b8c8f8 100644 --- a/webkit/storage/webkit_storage.gypi +++ b/webkit/storage/webkit_storage.gypi @@ -21,12 +21,12 @@ '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base_i18n', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/sql/sql.gyp:sql', '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', + '<(DEPTH)/url/url.gyp:url_lib', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base', ], 'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'], |