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 /ui/oak | |
| 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 'ui/oak')
| -rw-r--r-- | ui/oak/oak.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/oak/oak.gyp b/ui/oak/oak.gyp index 216d198..10df891 100644 --- a/ui/oak/oak.gyp +++ b/ui/oak/oak.gyp @@ -14,8 +14,8 @@ 'dependencies': [ '../../base/base.gyp:base', '../../base/base.gyp:base_i18n', - '../../build/temp_gyp/googleurl.gyp:googleurl', '../../skia/skia.gyp:skia', + '../../url/url.gyp:url', '../aura/aura.gyp:aura', '../compositor/compositor.gyp:compositor', '../ui.gyp:ui', |