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 <mbonadei@webrtc.org> Commit-Queue: Nico Weber <thakis@chromium.org> Reviewed-by: Nico Weber <thakis@chromium.org> Cr-Commit-Position: refs/heads/master@{#32613}
This commit is contained in:

committed by
Commit Bot

parent
62a9a32937
commit
02736010cb
11
DEPS
11
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.
|
||||
|
Reference in New Issue
Block a user