Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[engine] Fix builds targeting Android from a Windows host gen_snapshot #9190

Merged
merged 2 commits into from Jun 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
Expand Up @@ -121,7 +121,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '2025e6a31c70d7fca9bcb6618ab9a6a2c15b9a4f',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '263ee3b119f686591f8bb131bf22f53d384c2be2',

# Fuchsia compatibility
#
Expand Down
3 changes: 0 additions & 3 deletions tools/gn
Expand Up @@ -171,10 +171,7 @@ def to_gn_args(args):
else:
gn_args['dart_target_arch'] = gn_args['target_cpu']

# No cross-compilation on Windows (for now).
if sys.platform.startswith(('cygwin', 'win')):
if 'target_os' in gn_args:
gn_args['target_os'] = 'win'
if 'target_cpu' in gn_args:
gn_args['target_cpu'] = cpu_for_target_arch(gn_args['target_cpu'])

Expand Down