From a2b61d42752a6a10f1b6cf57c2483ec2805ba9c8 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Tue, 3 Nov 2015 11:54:37 -0800 Subject: [PATCH] Enable simulator builds when using precompilation for iOS --- sky/engine/bindings/bindings.gni | 2 +- sky/tools/gn | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sky/engine/bindings/bindings.gni b/sky/engine/bindings/bindings.gni index 09ad01c902a..f6cd013d872 100644 --- a/sky/engine/bindings/bindings.gni +++ b/sky/engine/bindings/bindings.gni @@ -56,7 +56,7 @@ template("dart_precompile") { "The dart script must be specified") dart_host_toolchain = host_toolchain - if (target_os == "ios") { + if (target_os == "ios" && !use_ios_simulator) { # During precompilation, a 64 bit Dart VM cannot generate code for a 32 bit # architecture (and vice-versa). The snapshotter that is running on the host # needs to know about the target architecture and built accordingly. diff --git a/sky/tools/gn b/sky/tools/gn index 76586325407..2775d2f7f06 100755 --- a/sky/tools/gn +++ b/sky/tools/gn @@ -50,10 +50,12 @@ def to_gn_args(args): elif args.target_os == 'ios': gn_args['target_os'] = 'ios' gn_args['ios_deployment_target'] = '7.0' + gn_args['use_ios_simulator'] = args.simulator if args.simulator: gn_args['use_libjpeg_turbo'] = False - gn_args['use_ios_simulator'] = args.simulator - gn_args['dart_target_arch'] = ios_target_cpu + else: + # The iOS simulator snapshot is host targetted + gn_args['dart_target_arch'] = ios_target_cpu else: gn_args['use_aura'] = False gn_args['use_glib'] = False