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

Roll buildroot and set ios_use_simulator variable used by Skia GN scripts #52101

Merged
merged 1 commit into from
Apr 15, 2024
Merged

Roll buildroot and set ios_use_simulator variable used by Skia GN scripts #52101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
11 changes: 6 additions & 5 deletions tools/gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down