From a976a871159f85f975fbd6f170d0a8f00a4aee49 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Wed, 8 Jun 2022 14:09:49 +0000 Subject: [PATCH] Download Fuchsia SDK. Bug: None Change-Id: I621408ab74ab3fa4f0ff60e53b000ef859223c93 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265382 Reviewed-by: Sarah Pham Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#37168} --- DEPS | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/DEPS b/DEPS index 6c9b1fafb8..599b6dd40b 100644 --- a/DEPS +++ b/DEPS @@ -17,6 +17,10 @@ vars = { # ResultDB version 'resultdb_version': 'git_revision:6cc18e2763e180929d70c786b419c1f8e6bcc66c', + + # By default, download the fuchsia sdk from the public sdk directory. + 'fuchsia_sdk_cipd_prefix': 'fuchsia/sdk/gn/', + 'fuchsia_version': 'version:8.20220607.3.1', } deps = { @@ -343,6 +347,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/fuchsia-sdk/sdk': { + 'packages': [ + { + 'package': Var('fuchsia_sdk_cipd_prefix') + '${{platform}}', + 'version': Var('fuchsia_version'), + }, + ], + 'condition': 'checkout_fuchsia', + 'dep_type': 'cipd', + }, + 'src/third_party/hamcrest': { 'packages': [ { @@ -2255,17 +2270,6 @@ hooks = [ 'condition': 'checkout_mac', 'action': ['python3', 'src/build/mac_toolchain.py'], }, - { - # Update the Fuchsia SDK if necessary. - 'name': 'Download Fuchsia SDK', - 'pattern': '.', - 'condition': 'checkout_fuchsia', - 'action': [ - 'python3', - 'src/build/fuchsia/update_sdk.py', - '--default-bucket=fuchsia', - ], - }, { # Note: On Win, this should run after win_toolchain, as it may use it. 'name': 'clang',