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

Remove word-size mismatch from 32-bit Android debug builds to work wi… (flutter/engine#3879)

Browse Source 
Roll Dart to be95b916ddf0af2b204286a438e7169e3bb2c67a.
This commit is contained in:
Ryan Macnak 2017-07-17 09:45:10 -07:00 committed by GitHub
parent 1622edea30
commit 2ef24d4d12
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -30,7 +30,7 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
# You can use //tools/dart/create_updated_fluter_deps.py to produce
# updated revision list of existing dependencies.
'dart_revision': '1bfd01c1f7a57fed039ce8ab95df2a5f14cf63b6',
'dart_revision': 'be95b916ddf0af2b204286a438e7169e3bb2c67a',
'dart_args_tag': '0.13.7',
'dart_async_tag': 'daf66909019d2aaec1721fc39d94ea648a9fdc1d',

23
engine/src/flutter/tools/gn
View File

@ -94,10 +94,9 @@ def to_gn_args(args):
gn_args['target_cpu'] = 'x64'
else:
gn_args['target_cpu'] = 'arm64'
gn_args['flutter_aot'] = aot
if aot:
gn_args['dart_target_arch'] = gn_args['target_cpu']
else:
# Building host artifacts
gn_args['target_cpu'] = 'x64'
# No cross-compilation on Windows (for now).
if sys.platform.startswith(('cygwin', 'win')):
@ -114,20 +113,24 @@ def to_gn_args(args):
gn_args['dart_target_arch'] = 'dbc'
# Modify host_toolchain into dart_host_toolchain so it matches word size of target_cpu
if args.target_os == 'android' and aot and gn_args['target_cpu'] == 'arm':
target_is_32_bit = gn_args['target_cpu'] == 'arm' or gn_args['target_cpu'] == 'x86'
if target_is_32_bit:
if sys.platform.startswith('linux'):
gn_args['dart_host_toolchain'] = "//build/toolchain/linux:clang_x86"
elif sys.platform.startswith('darwin'):
gn_args['dart_host_toolchain'] = "//build/toolchain/mac:clang_i386"
elif sys.platform.startswith('win'):
gn_args['dart_host_toolchain'] = "//build/toolchain/win:x86"
elif args.target_os == "ios" and not args.simulator:
if gn_args['target_cpu'] == 'arm':
gn_args['dart_host_toolchain'] = '//build/toolchain/mac:clang_i386'
elif gn_args['target_cpu'] == 'arm64':
gn_args['dart_host_toolchain'] = '//build/toolchain/mac:clang_x64'
else:
if sys.platform.startswith('linux'):
gn_args['dart_host_toolchain'] = "//build/toolchain/linux:clang_x64"
elif sys.platform.startswith('darwin'):
gn_args['dart_host_toolchain'] = "//build/toolchain/mac:clang_x64"
elif sys.platform.startswith('win'):
gn_args['dart_host_toolchain'] = "//build/toolchain/win:x64"
gn_args['flutter_runtime_mode'] = args.runtime_mode
gn_args['flutter_aot'] = aot
if args.target_sysroot:
gn_args['target_sysroot'] = args.target_sysroot