Roll buildroot and set ios_use_simulator variable used by Skia GN scripts (flutter/engine#52101)

This commit is contained in:
Jason Simmons 2024-04-15 10:54:04 -07:00 committed by GitHub
parent 0951e43921
commit 595f6bd256
2 changed files with 7 additions and 6 deletions

2
DEPS
View File

@ -288,7 +288,7 @@ allowed_hosts = [
]
deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'dcd71b5b237e1e58f2ad8a7e51bead0c2a3755a9',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '915f67999bfb4eb77cf596bbadacdce7868ede49',
'src/flutter/third_party/depot_tools':
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',

View File

@ -576,11 +576,12 @@ def to_gn_args(args):
if get_host_os() == 'mac' and not args.force_mac_arm64:
gn_args['host_cpu'] = 'x64'
if gn_args['target_os'] == 'ios':
gn_args['use_ios_simulator'] = args.simulator
gn_args.update(setup_apple_sdks())
elif get_host_os() == 'mac':
gn_args['use_ios_simulator'] = False
if gn_args['target_os'] == 'ios' or get_host_os() == 'mac':
if gn_args['target_os'] == 'ios':
gn_args['use_ios_simulator'] = args.simulator
else:
gn_args['use_ios_simulator'] = False
gn_args['ios_use_simulator'] = gn_args['use_ios_simulator']
gn_args.update(setup_apple_sdks())
if args.dart_debug: