diff options
| author | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 20:13:18 +0000 |
|---|---|---|
| committer | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 20:13:18 +0000 |
| commit | 0b31351ef3f852293a41fe71d0c8bcf3d21a9105 (patch) | |
| tree | a94d34b1320937d1c5bd2ebabaedd4af762c85ac /webkit | |
| parent | 061561df557e6c0e14e4207b3700e398f554351d (diff) | |
| download | chromium_src-0b31351ef3f852293a41fe71d0c8bcf3d21a9105.zip chromium_src-0b31351ef3f852293a41fe71d0c8bcf3d21a9105.tar.gz chromium_src-0b31351ef3f852293a41fe71d0c8bcf3d21a9105.tar.bz2 | |
Lets try this again.
Revert 193983 "Revert 193968 "Roll the DEPS for google-url.""
> Revert 193968 "Roll the DEPS for google-url."
>
> > Roll the DEPS for google-url.
> >
> > And update all the references from build/temp_gyp/googleurl.gyp to url/url.gyp.
> >
> > This also changes googleurl.gyp to reference the files under url/, so that we
> > don't break the Blink tree.
> >
> > BUG=229660
> > R=brettw@chromium.org
> > TBR=brettw@chromium.org
> >
> > Review URL: https://chromiumcodereview.appspot.com/14089011
>
> TBR=tfarina@chromium.org
> Review URL: https://codereview.chromium.org/14028012
TBR=michaeln@google.com
Review URL: https://codereview.chromium.org/14109014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/base/webkit_base.gypi | 2 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 2 | ||||
| -rw-r--r-- | webkit/storage/webkit_storage.gypi | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/webkit/base/webkit_base.gypi b/webkit/base/webkit_base.gypi index c0c43a3..c62aef9 100644 --- a/webkit/base/webkit_base.gypi +++ b/webkit/base/webkit_base.gypi @@ -10,8 +10,8 @@ '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)/url/url.gyp:url', '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'defines': ['WEBKIT_BASE_IMPLEMENTATION'], diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index fb29dce..4e4654c 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -76,7 +76,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)/media/media.gyp:media', @@ -93,6 +92,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', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi index 0d809ae..803b75d 100644 --- a/webkit/storage/webkit_storage.gypi +++ b/webkit/storage/webkit_storage.gypi @@ -29,11 +29,11 @@ '<(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/leveldatabase/leveldatabase.gyp:leveldatabase', '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', + '<(DEPTH)/url/url.gyp:url', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base', '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', ], diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index f5e10ec..803e8c2 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -53,7 +53,7 @@ 'chromium_code': 1, }, 'dependencies': [ - '../build/temp_gyp/googleurl.gyp:googleurl', + '../url/url.gyp:url', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base_i18n', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', @@ -361,7 +361,7 @@ 'chromium_code': 1, }, 'dependencies': [ - '../build/temp_gyp/googleurl.gyp:googleurl', + '../url/url.gyp:url', 'test_shell_common', '<(DEPTH)/base/base.gyp:test_support_base', '<(DEPTH)/net/net.gyp:net', |