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 /build/all.gyp | |
| 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 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/build/all.gyp b/build/all.gyp index b4cc305..ec97dd0 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -27,8 +27,8 @@ '../third_party/sqlite/sqlite.gyp:*', '../third_party/zlib/zlib.gyp:*', '../ui/ui.gyp:*', - '../url/url.gyp:*', '../webkit/support/webkit_support.gyp:*', + 'temp_gyp/googleurl.gyp:*', ], 'conditions': [ ['OS!="ios"', { @@ -203,7 +203,7 @@ '../net/net.gyp:net_unittests', '../sql/sql.gyp:sql_unittests', '../ui/ui.gyp:ui_unittests', - '../url/url.gyp:googleurl_unittests', + 'temp_gyp/googleurl.gyp:googleurl_unittests', ], 'conditions': [ ['OS!="ios"', { @@ -458,8 +458,8 @@ '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - '../url/url.gyp:googleurl_unittests', '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', + 'temp_gyp/googleurl.gyp:googleurl_unittests', ], }, { @@ -489,8 +489,8 @@ '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - '../url/url.gyp:googleurl_unittests', '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', + 'temp_gyp/googleurl.gyp:googleurl_unittests', ], }, { @@ -500,15 +500,15 @@ '../base/base.gyp:base_unittests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', '../crypto/crypto.gyp:crypto_unittests', + 'temp_gyp/googleurl.gyp:googleurl_unittests', + '../net/net.gyp:net_unittests', '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', '../media/media.gyp:media_unittests', - '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - '../url/url.gyp:googleurl_unittests', ], }, { @@ -542,7 +542,7 @@ '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - '../url/url.gyp:googleurl_unittests', + 'temp_gyp/googleurl.gyp:googleurl_unittests', ], }, ], # targets @@ -587,9 +587,9 @@ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', '../ui/views/views.gyp:views_unittests', - '../url/url.gyp:googleurl_unittests', '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn', + 'temp_gyp/googleurl.gyp:googleurl_unittests', ], 'conditions': [ ['target_arch!="x64"', { @@ -644,7 +644,7 @@ '../sql/sql.gyp:sql_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - '../url/url.gyp:googleurl_unittests', + 'temp_gyp/googleurl.gyp:googleurl_unittests', ], }, { @@ -667,7 +667,7 @@ '../sql/sql.gyp:sql_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - '../url/url.gyp:googleurl_unittests', + 'temp_gyp/googleurl.gyp:googleurl_unittests', ], }, { |