Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit fed19a6

Browse files
Roll buildroot and set ios_use_simulator variable used by Skia GN scripts (#52101)
1 parent 84238c4 commit fed19a6

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ allowed_hosts = [
288288
]
289289

290290
deps = {
291-
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'dcd71b5b237e1e58f2ad8a7e51bead0c2a3755a9',
291+
'src': 'https://github.com/flutter/buildroot.git' + '@' + '915f67999bfb4eb77cf596bbadacdce7868ede49',
292292

293293
'src/flutter/third_party/depot_tools':
294294
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',

tools/gn

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -576,11 +576,12 @@ def to_gn_args(args):
576576
if get_host_os() == 'mac' and not args.force_mac_arm64:
577577
gn_args['host_cpu'] = 'x64'
578578

579-
if gn_args['target_os'] == 'ios':
580-
gn_args['use_ios_simulator'] = args.simulator
581-
gn_args.update(setup_apple_sdks())
582-
elif get_host_os() == 'mac':
583-
gn_args['use_ios_simulator'] = False
579+
if gn_args['target_os'] == 'ios' or get_host_os() == 'mac':
580+
if gn_args['target_os'] == 'ios':
581+
gn_args['use_ios_simulator'] = args.simulator
582+
else:
583+
gn_args['use_ios_simulator'] = False
584+
gn_args['ios_use_simulator'] = gn_args['use_ios_simulator']
584585
gn_args.update(setup_apple_sdks())
585586

586587
if args.dart_debug:

0 commit comments

Comments
 (0)