From 595f6bd2560bce99b22184e5278992f2bfcf3479 Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Mon, 15 Apr 2024 10:54:04 -0700 Subject: [PATCH] Roll buildroot and set ios_use_simulator variable used by Skia GN scripts (flutter/engine#52101) --- DEPS | 2 +- engine/src/flutter/tools/gn | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/DEPS b/DEPS index 3d8a7b0c4a8..ecb68ed5892 100644 --- a/DEPS +++ b/DEPS @@ -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', diff --git a/engine/src/flutter/tools/gn b/engine/src/flutter/tools/gn index a6bc832497f..74bdd3f8042 100755 --- a/engine/src/flutter/tools/gn +++ b/engine/src/flutter/tools/gn @@ -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: