From ef9ab80b0c4af2b4ad37729d2e2b89add8164100 Mon Sep 17 00:00:00 2001 From: Wez Date: Fri, 6 Oct 2017 19:32:18 +0000 Subject: [PATCH] Roll Fuchsia SDK to 226f6dd0cad1d6be63a353ce2649423470729ae9. This roll includes: - Redefinition of zx_handle_t from int to unsigned int, requiring fixes to call-sites that tried to reinterpret_cast(int). - Move of sysroot files to per-architecture sub-directories, as part of ARM64 bring-up. Bug: 707030, 772031 Change-Id: If65230b296c9a07eee3460cb9abbd5e7f7beeb30 Reviewed-on: https://chromium-review.googlesource.com/703989 Reviewed-by: Alexei Svitkine Reviewed-by: Sergey Ulanov Commit-Queue: Wez Cr-Original-Commit-Position: refs/heads/master@{#507143} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: f88170e15156f33171b07465cc0b6042dd130ef4 --- fuchsia/runner_common.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fuchsia/runner_common.py b/fuchsia/runner_common.py index 9055ba99e..e58c38cd1 100755 --- a/fuchsia/runner_common.py +++ b/fuchsia/runner_common.py @@ -243,7 +243,9 @@ def BuildBootfs(output_directory, runtime_deps, bin_name, child_args, dry_run, if _RunAndCheck( dry_run, [mkbootfs_path, '-o', bootfs_name, - '--target=boot', os.path.join(SDK_ROOT, 'bootdata.bin'), + # TODO(wez): Parameterize this on the |target_cpu| from GN. + '--target=boot', os.path.join( + SDK_ROOT, 'target', 'x86_64', 'bootdata.bin'), '--target=system', manifest_file.name]) != 0: return None @@ -361,7 +363,8 @@ def _GetResultsFromImg(dry_run, test_launcher_summary_output): def RunFuchsia(bootfs_data, use_device, dry_run, test_launcher_summary_output): - kernel_path = os.path.join(SDK_ROOT, 'kernel', 'zircon.bin') + # TODO(wez): Parameterize this on the |target_cpu| from GN. + kernel_path = os.path.join(SDK_ROOT, 'target', 'x86_64', 'zircon.bin') if use_device: # TODO(fuchsia): This doesn't capture stdout as there's no way to do so