Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Use simarm_x64 when targeting arm #10010

Merged
merged 8 commits into from
Aug 1, 2019
Merged

Use simarm_x64 when targeting arm #10010

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
83d7914
GN changes for simarm_x64
liamappelbe Jul 8, 2019
1d7d918
GN changes for simarm_x64
liamappelbe Jul 8, 2019
eb3a0e5
Cleanup a bit
liamappelbe Jul 18, 2019
45920fc
Guard simarm_x64 behind a flag
liamappelbe Jul 22, 2019
30de189
Remove flag
liamappelbe Jul 22, 2019
0934979
Merge branch 'simarm_x64' of github.com:liamappelbe/engine into simar…
liamappelbe Jul 22, 2019
2eb254d
Remove Mac specificity
liamappelbe Jul 22, 2019
44dd647
Merge branch 'master' of github.com:flutter/engine into simarm_x64
liamappelbe Jul 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions tools/gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,9 @@ def to_gn_args(args):

gn_args['dart_custom_version_for_pub'] = 'flutter'

# Make sure host_cpu matches the bit width of target_cpu.
target_is_32_bit = gn_args['target_cpu'] == 'arm' or gn_args['target_cpu'] == 'x86'
if target_is_32_bit:
gn_args["host_cpu"] = "x86"
# Make sure host_cpu matches the bit width of target_cpu on x86.
if gn_args['target_cpu'] == 'x86':
gn_args['host_cpu'] = 'x86'

gn_args['flutter_runtime_mode'] = runtime_mode

Expand Down