diff options
| author | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 19:23:04 +0000 |
|---|---|---|
| committer | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 19:23:04 +0000 |
| commit | 173509e01940012228b386bf50c26d42e1586022 (patch) | |
| tree | 523d90bc858cffd19441f4f2259e49f512c681e2 /components/autofill.gypi | |
| parent | e217c563ed3adcee9d4fd6135b260e8084c12401 (diff) | |
| download | chromium_src-173509e01940012228b386bf50c26d42e1586022.zip chromium_src-173509e01940012228b386bf50c26d42e1586022.tar.gz chromium_src-173509e01940012228b386bf50c26d42e1586022.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/autofill.gypi')
| -rw-r--r-- | components/autofill.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/autofill.gypi b/components/autofill.gypi index e411aa3..00f31c0 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,6 +108,7 @@ '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', @@ -118,7 +119,6 @@ '../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 |