DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1924 from chinmaygarde/master

Browse Source 
Enable simulator builds when using precompilation for iOS
This commit is contained in:
Chinmay Garde 2015-11-03 12:30:35 -08:00
commit ef4e90c0ff
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sky/engine/bindings/bindings.gni
View File

@ -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.

6
sky/tools/gn
View File

@ -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