From e19a4e115fefa80ec4a3db81af9a3fc7765447f2 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Fri, 29 Jun 2018 06:31:35 +0000 Subject: [PATCH] Revert "Pull GN via CIPD package." This reverts commit 77cc8182aef6ec97ecd4c115fae5de4f511efa57. Reason for revert: Breaks DEPS Auto-roller. Original change's description: > Pull GN via CIPD package. > > The gn binary will be downloaded into third_party/gn. > > The part about gn_win will be true only after the buildtools_revision > will be updated by the Chromium roll. > > This CL has been copied from https://chromium-review.googlesource.com/c/chromium/src/+/1117264/9/DEPS. > > Bug: None > Change-Id: I3fee1d9f6c39e508871798eeeb60d74ab7bc41d1 > Reviewed-on: https://webrtc-review.googlesource.com/86123 > Commit-Queue: Mirko Bonadei > Reviewed-by: Oleh Prypin > Cr-Commit-Position: refs/heads/master@{#23765} TBR=mbonadei@webrtc.org,oprypin@webrtc.org Change-Id: I660196e48a626e87ec5ed722b2a169620494d74c No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: None Reviewed-on: https://webrtc-review.googlesource.com/86220 Reviewed-by: Mirko Bonadei Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#23778} --- DEPS | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/DEPS b/DEPS index 4f281144f7..661ddb97e5 100644 --- a/DEPS +++ b/DEPS @@ -104,15 +104,6 @@ deps = { Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + 'cb3514a0858be0f66281d892e2242d1073fd75fe', 'src/third_party/googletest/src': Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + 'ce468a17c434e4e79724396ee1b51d86bfc8a88b', - 'src/third_party/gn': { - 'packages': [ - { - 'package': 'gn/gn/${{platform}}', - 'version': 'git_revision:f30b5738e20fdd2f00eba6298c536d66c13b09e3', - }, - ], - 'dep_type': 'cipd', - }, 'src/third_party/icu': { 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '172d33141cd16df9d027cfd49bfe940b1dc66f1a', }, @@ -504,12 +495,7 @@ hooks = [ 'action': ['python', 'src/build/util/lastchange.py', '-o', 'src/build/util/LASTCHANGE'], }, - # Downloads a old stub where the GN binary used to live. This is *not* the GN - # binary that anything should use any more (see third_party/gn, which is - # pulled by cipd above). This stub simply prints that it's the wrong location, - # and returns with an exit code of 1, so that we: a) notice that the wrong - # binary is being used; 2) help users who rely on gn's automatic regeneration - # so that they know to re-run `gn gen`. + # Pull GN binaries. { 'name': 'gn_win', 'pattern': '.',