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

Use the i386 toolchain on the Mac host when targetting Android AOTC. (#2685)

Browse Source
This commit is contained in:
Chinmay Garde 2016-05-13 14:26:56 -07:00
parent ed3634e207
commit 053630dc09
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,10 +8,11 @@ import("//sky/engine/config.gni")
bindings_output_dir = "$root_gen_dir/sky/bindings"
dart_host_toolchain = host_toolchain
# 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.
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.
if (target_cpu == "arm") {
dart_host_toolchain = "//build/toolchain/mac:clang_i386"
} else if (target_cpu == "arm64") {
@ -20,9 +21,15 @@ if (target_os == "ios" && !use_ios_simulator) {
assert(false, "Unknown active architecture on iOS")
}
}
if (target_os == "android" && flutter_aot) {
if (host_os == "linux" && target_cpu == "arm") {
dart_host_toolchain = "//build/toolchain/linux:clang_x86"
if (target_cpu == "arm") {
if (host_os == "linux") {
dart_host_toolchain = "//build/toolchain/linux:clang_x86"
}
if (host_os == "mac") {
dart_host_toolchain = "//build/toolchain/mac:clang_i386"
}
}
}