From 02736010cb171c3cc36ea2039911a6dadec9952d Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Mon, 16 Nov 2020 15:26:09 +0100 Subject: [PATCH] Stop setting mac_xcode_version in DEPS Bug: chromium:1147839 Change-Id: I8013eb93678ae8b388622d014bbb05a6bda4770d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/193640 Commit-Queue: Mirko Bonadei Commit-Queue: Nico Weber Reviewed-by: Nico Weber Cr-Commit-Position: refs/heads/master@{#32613} --- DEPS | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/DEPS b/DEPS index 6c388b195b..e5aea9728f 100644 --- a/DEPS +++ b/DEPS @@ -1,9 +1,6 @@ # This file contains dependencies for WebRTC. gclient_gn_args_file = 'src/build/config/gclient_args.gni' -gclient_gn_args = [ - 'mac_xcode_version', -] vars = { # By default, we should check out everything needed to run on the main @@ -11,11 +8,6 @@ vars = { 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', 'chromium_revision': '32410c4f6c92a8019fabbf73520fcb91561771aa', - - # This can be overridden, e.g. with custom_vars, to download a nonstandard - # Xcode version in build/mac_toolchain.py - # instead of downloading the prebuilt pinned revision. - 'mac_xcode_version': 'default', } deps = { @@ -3039,8 +3031,7 @@ hooks = [ 'name': 'mac_toolchain', 'pattern': '.', 'condition': 'checkout_mac', - 'action': ['python', 'src/build/mac_toolchain.py', - '--xcode-version', Var('mac_xcode_version')], + 'action': ['python', 'src/build/mac_toolchain.py'], }, { # Note: On Win, this should run after win_toolchain, as it may use it.