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 /components | |
| 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 'components')
| -rw-r--r-- | components/autofill.gypi | 4 | ||||
| -rw-r--r-- | components/sessions.gypi | 2 | ||||
| -rw-r--r-- | components/visitedlink.gypi | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/components/autofill.gypi b/components/autofill.gypi index 17a331d..cc563f7 100644 --- a/components/autofill.gypi +++ b/components/autofill.gypi @@ -53,11 +53,11 @@ 'type': 'static_library', 'dependencies': [ '../base/base.gyp:base', - '../build/temp_gyp/googleurl.gyp:googleurl', '../content/content.gyp:content_common', '../ipc/ipc.gyp:ipc', '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '../ui/ui.gyp:ui', + '../url/url.gyp:url_lib', ], 'conditions': [ ['OS == "android"', { @@ -121,7 +121,6 @@ '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../base/base.gyp:base_prefs', - '../build/temp_gyp/googleurl.gyp:googleurl', '../content/content.gyp:content_browser', '../content/content.gyp:content_common', '../google_apis/google_apis.gyp:google_apis', @@ -133,6 +132,7 @@ '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', '../ui/ui.gyp:ui', + '../url/url.gyp:url_lib', '../webkit/support/webkit_support.gyp:webkit_resources', 'component_resources.gyp:component_resources', diff --git a/components/sessions.gypi b/components/sessions.gypi index 2741a3d..ad56821 100644 --- a/components/sessions.gypi +++ b/components/sessions.gypi @@ -9,10 +9,10 @@ 'type': '<(component)', 'dependencies': [ '../base/base.gyp:base', - '../build/temp_gyp/googleurl.gyp:googleurl', '../content/content.gyp:content_browser', '../skia/skia.gyp:skia', '../third_party/protobuf/protobuf.gyp:protobuf_lite', + '../url/url.gyp:url_lib', ], 'include_dirs': [ '..', diff --git a/components/visitedlink.gypi b/components/visitedlink.gypi index ddaa20f..439a848 100644 --- a/components/visitedlink.gypi +++ b/components/visitedlink.gypi @@ -10,8 +10,8 @@ 'dependencies': [ '../base/base.gyp:base', '../content/content.gyp:content_common', - '../build/temp_gyp/googleurl.gyp:googleurl', '../ipc/ipc.gyp:ipc', + '../url/url.gyp:url_lib', ], 'sources': [ 'visitedlink/common/visitedlink_common.cc', |