Skip to content

Commit

Permalink
Remove reclient from buildtools/DEPS
Browse files Browse the repository at this point in the history
This is already in chrome's DEPS file, and nothing else uses this yet.
So this should be safe to remove.

Bug: 1177288
Change-Id: I00e6476ad0eb0e44625465bca73da5eaddb63d14
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2722571
Auto-Submit: Nico Weber <thakis@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#858169}
  • Loading branch information
nico authored and Chromium LUCI CQ committed Feb 26, 2021
1 parent 6ab5abc commit 332332a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 23 deletions.
6 changes: 3 additions & 3 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,6 @@ vars = {
# e.g. with custom_vars.
'checkout_ios_webkit': False,

# By default, do not checkout the re-client binaries.
'checkout_reclient': False,

# Fetches only the SDK boot images which match at least one of the whitelist
# entries in a comma-separated list.
#
Expand Down Expand Up @@ -188,6 +185,9 @@ vars = {
# for info on RTS
'checkout_rts_model': False,

# By default, do not check out the re-client binaries.
'checkout_reclient': False,

# reclient CIPD package version
'reclient_version': 're_client_version:0.22.0.d95c8de',

Expand Down
3 changes: 1 addition & 2 deletions PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -4134,8 +4134,7 @@ def CheckBuildtoolsRevisionsAreInSync(input_api, output_api):

# Update this regexp if new revisions are added to the files.
rev_regexp = input_api.re.compile(
("'((clang_format|libcxx|libcxxabi)_revision|gn_version|"
"reclient_version)':"))
("'((clang_format|libcxx|libcxxabi)_revision|gn_version)':"))

# If a user is changing one revision, they need to change the same
# line in both files. This means that any given change should contain
Expand Down
20 changes: 2 additions & 18 deletions buildtools/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,19 @@ use_relative_paths = True
vars = {
'chromium_url': 'https://chromium.googlesource.com',

#
# TODO(crbug.com/1177288): Remove this file. Please don't add to it.

# TODO(crbug.com/941824): The values below need to be kept in sync
# between //DEPS and //buildtools/DEPS, so if you're updating one,
# update the other. There is a presubmit check that checks that
# you've done so; if you are adding new tools to //buildtools and
# hence new revisions to this list, make sure you update the
# _CheckBuildtoolsRevsAreInSync in PRESUBMIT.py to include the additional
# revisions.
#

# GN CIPD package version.
'gn_version': 'git_revision:dfcbc6fed0a8352696f92d67ccad54048ad182b3',

# By default, do not checkout the re-client binaries.
'checkout_reclient': False,

# reclient CIPD package version
'reclient_version': 're_client_version:0.22.0.d95c8de',

# When changing these, also update the svn revisions in deps_revisions.gni
# TODO(crbug.com/1166332) rename to clang_format_revision.
'clang_fmt_revision': '99803d74e35962f63a775f29477882afd4d57d94',
Expand Down Expand Up @@ -72,14 +66,4 @@ deps = {
'dep_type': 'cipd',
'condition': 'host_os == "win"',
},
'reclient': {
'packages': [
{
'package': 'infra/rbe/client/${{platform}}',
'version': Var('reclient_version'),
}
],
'dep_type': 'cipd',
'condition': '(host_os == "linux" or host_os == "win") and checkout_reclient',
},
}

0 comments on commit 332332a

Please sign in to comment.