diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 18:29:52 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 18:29:52 +0000 |
| commit | e6b2093a888e1e55626475dfe9cc813596b206bc (patch) | |
| tree | e4ef749d9c58e52f902b5c2d90944c5827d6e8ed /components | |
| parent | f55849fdae7bd1fdc7cc52767f99d91251496ad0 (diff) | |
| download | chromium_src-e6b2093a888e1e55626475dfe9cc813596b206bc.zip chromium_src-e6b2093a888e1e55626475dfe9cc813596b206bc.tar.gz chromium_src-e6b2093a888e1e55626475dfe9cc813596b206bc.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
| -rw-r--r-- | components/autofill.gypi | 4 | ||||
| -rw-r--r-- | components/visitedlink.gypi | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/components/autofill.gypi b/components/autofill.gypi index 00f31c0..e411aa3 100644 --- a/components/autofill.gypi +++ b/components/autofill.gypi @@ -44,11 +44,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', ], 'conditions': [ ['OS == "android"', { @@ -108,7 +108,6 @@ 'webdata_common', '../base/base.gyp:base', '../base/base.gyp:base_i18n', - '../build/temp_gyp/googleurl.gyp:googleurl', '../content/content.gyp:content_browser', '../content/content.gyp:content_common', '../ipc/ipc.gyp:ipc', @@ -119,6 +118,7 @@ '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', '../ui/ui.gyp:ui', + '../url/url.gyp:url', '../webkit/support/webkit_support.gyp:webkit_resources', # For grip/generated_resources.h and grit/chromium_strings.h diff --git a/components/visitedlink.gypi b/components/visitedlink.gypi index ddaa20f..9e380b2 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', ], 'sources': [ 'visitedlink/common/visitedlink_common.cc', |