From 2ef24d4d12ff1eb24feebf7fcf6d212045e05826 Mon Sep 17 00:00:00 2001 From: Ryan Macnak Date: Mon, 17 Jul 2017 09:45:10 -0700 Subject: [PATCH] =?UTF-8?q?Remove=20word-size=20mismatch=20from=2032-bit?= =?UTF-8?q?=20Android=20debug=20builds=20to=20work=20wi=E2=80=A6=20(flutte?= =?UTF-8?q?r/engine#3879)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Roll Dart to be95b916ddf0af2b204286a438e7169e3bb2c67a. --- DEPS | 2 +- engine/src/flutter/tools/gn | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/DEPS b/DEPS index f393aeba282..c8e58b9d04f 100644 --- a/DEPS +++ b/DEPS @@ -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', diff --git a/engine/src/flutter/tools/gn b/engine/src/flutter/tools/gn index 1435c8020f3..531b21b5d69 100755 --- a/engine/src/flutter/tools/gn +++ b/engine/src/flutter/tools/gn @@ -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