From dfdc7327fb66a3e44a3eb97c992cbd9fb76b61d1 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Thu, 23 Jul 2015 14:30:49 -0700 Subject: [PATCH] Fix sky/tools/gn --ios --simulator to set the correct target_cpu Also fixed missing dependency from LocalDOMWindow.cpp on mojo's navigation service. Not sure why gn check missed that. R=abarth@google.com --- sky/engine/core/BUILD.gn | 1 + sky/tools/gn | 2 +- sky/tools/gn_test.py | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sky/engine/core/BUILD.gn b/sky/engine/core/BUILD.gn index 57edbfa8a..e655074b9 100644 --- a/sky/engine/core/BUILD.gn +++ b/sky/engine/core/BUILD.gn @@ -77,6 +77,7 @@ static_library("core") { "//dart/runtime/bin:embedded_dart_io", "//dart/runtime:libdart", "//dart/runtime/vm:libdart_platform", + "//mojo/services/navigation/public/interfaces", ] sources = sky_core_files diff --git a/sky/tools/gn b/sky/tools/gn index d4ee5a425..501f64c58 100755 --- a/sky/tools/gn +++ b/sky/tools/gn @@ -52,7 +52,7 @@ def to_gn_args(args): gn_args['use_glib'] = False gn_args['use_system_harfbuzz'] = False - if args.target_os in ['android', 'ios']: + if args.target_os in ['android', 'ios'] and not args.simulator: gn_args['target_cpu'] = 'arm' else: gn_args['target_cpu'] = 'x64' diff --git a/sky/tools/gn_test.py b/sky/tools/gn_test.py index 455d05ffa..7bbc37c01 100644 --- a/sky/tools/gn_test.py +++ b/sky/tools/gn_test.py @@ -22,6 +22,15 @@ class GNTestCase(unittest.TestCase): self._expect_build_dir(['--android'], 'out/android_Debug') self._expect_build_dir(['--android', '--release'], 'out/android_Release') + def _gn_args(self, arg_list): + args = gn.parse_args(['gn'] + arg_list) + return gn.to_gn_args(args) + + def test_to_gn_args(self): + # This would not necesarily be true on a 32-bit machine? + self.assertEquals(self._gn_args(['--ios', '--simulator'])['target_cpu'], 'x64') + self.assertEquals(self._gn_args(['--ios'])['target_cpu'], 'arm') + if __name__ == '__main__': unittest.main()