From e5e0941740747b1b50ed71389bc6210874e0c531 Mon Sep 17 00:00:00 2001 From: Michael Savigny Date: Fri, 20 Nov 2020 18:51:50 +0000 Subject: [PATCH] Add re-client linux binaries to DEPS. Fetch re-client binaries CIPD package via CIPD during gclient sync step. Bug: 1149386 Change-Id: Iaa3546c4a7df2f6e83d1e2ad5b0a755d2df47b5f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2542303 Auto-Submit: Michael Savigny Commit-Queue: Dirk Pranke Reviewed-by: Dirk Pranke Cr-Commit-Position: refs/heads/master@{#829730} --- .gitignore | 1 + DEPS | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 57e16a35651078..c75691e27d81d6 100644 --- a/.gitignore +++ b/.gitignore @@ -297,6 +297,7 @@ vs-chromium-project.txt /tools/metrics/histograms/histograms_xml/*.before.pretty-print.xml /tools/metrics/histograms/enums.before.pretty-print.xml /tools/page_cycler/acid3 +/tools/reclient /tools/skia_goldctl/ /tools/swarming_client /tools/tryserver diff --git a/DEPS b/DEPS index 80c99001b02d71..b1888530ac0912 100644 --- a/DEPS +++ b/DEPS @@ -139,6 +139,9 @@ 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. # @@ -447,7 +450,16 @@ deps = { 'dep_type': 'cipd', 'condition': 'host_os == "win"', }, - + 'src/tools/reclient': { + 'packages': [ + { + 'package': 'infra/rbe/client/linux-amd64', + 'version': 'FY971v8hquNEs2x-L-AvVGygtX9sFTRy9aloq85WbqYC', + } + ], + 'dep_type': 'cipd', + 'condition': 'host_os == "linux" and checkout_reclient', + }, 'src/chrome/browser/resources/media_router/extension/src': Var('chromium_git') + '/media_router.git' + '@' + 'd4389c097c61fa8c5aa5eb7c3ba34ee203dd62e3',