Commit 2c9efdd8 authored by Kevin Marshall's avatar Kevin Marshall Committed by Commit Bot

Fuchsia: Use "fx" for out directory configuration in local-sdk.py.

local-sdk.py used "gen.py" which was deprecated and removed from
Fuchsia.

Change-Id: I390c7458eb863e19167a6255db2aed6e9b8233c2
Reviewed-on: https://chromium-review.googlesource.com/1003077Reviewed-by: default avatarJames Robinson <jamesr@chromium.org>
Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549247}
parent 29e5097b
...@@ -32,18 +32,19 @@ def EnsureEmptyDir(path): ...@@ -32,18 +32,19 @@ def EnsureEmptyDir(path):
def BuildForArch(arch): def BuildForArch(arch):
Run('scripts/build-zircon.sh', '-t', arch) build_dir = 'out/release-' + arch
Run('build/gn/gen.py', '--target_cpu=' + arch, Run('scripts/fx', 'set', arch,
'--packages=garnet/packages/sdk/base', '--release') '--packages=garnet/packages/sdk/base',
Run('buildtools/ninja', '-C', 'out/release-' + arch) '--args=is_debug=false', build_dir)
Run('scripts/fx', 'full-build')
# Also build the deprecated bootfs-based image. # Also build the deprecated bootfs-based image.
# TODO(crbug.com/805057): Remove this once the bootfs path is turned down. # TODO(crbug.com/805057): Remove this once bootfs is turned down.
build_dir_bootfs = 'out/release-' + arch + '-bootfs' build_dir_bootfs = 'out/release-' + arch + '-bootfs'
Run('build/gn/gen.py', '--target_cpu=' + arch, Run('scripts/fx', 'set', arch,
'--packages=garnet/packages/sdk/bootfs', '--release', '--packages=garnet/packages/sdk/bootfs', '--args=is_debug=false',
'--args=bootfs_packages=true', '--args=bootfs_packages=true', build_dir_bootfs)
'--build-dir='+build_dir_bootfs) Run('scripts/fx', 'full-build')
Run('buildtools/ninja', '-C', build_dir_bootfs)
def main(args): def main(args):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment