diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-15 09:01:51 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-15 09:01:51 +0000 |
| commit | 1ebd27de13659e30680e7ee530e550a95b6d12ef (patch) | |
| tree | 67ff85a45aa726e42f10e37e141fb105a9d68d8b /chrome/chrome_common.gypi | |
| parent | 111b242e947493ee23297029bcbabe3725869b53 (diff) | |
| download | chromium_src-1ebd27de13659e30680e7ee530e550a95b6d12ef.zip chromium_src-1ebd27de13659e30680e7ee530e550a95b6d12ef.tar.gz chromium_src-1ebd27de13659e30680e7ee530e550a95b6d12ef.tar.bz2 | |
Revert 193992 "Lets try this again."
The XP bots are still red, and it's still whining about URL.DLL
> 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
TBR=michaeln@google.com
Review URL: https://codereview.chromium.org/14263002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_common.gypi')
| -rw-r--r-- | chrome/chrome_common.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 010d9e2..236089f 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -32,6 +32,7 @@ '<(DEPTH)/base/base.gyp:base_i18n', '<(DEPTH)/base/base.gyp:base_prefs', '<(DEPTH)/base/base.gyp:base_static', + '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources', @@ -48,7 +49,6 @@ '<(DEPTH)/third_party/mt19937ar/mt19937ar.gyp:mt19937ar', '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', '<(DEPTH)/ui/ui.gyp:ui_resources', - '<(DEPTH)/url/url.gyp:url', '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent', ], 'sources': [ |