Commit fa268a7a authored by Aidan Wolter's avatar Aidan Wolter Committed by Commit Bot

Use topaz SDK for local SDK builds

Bug: None
Test: ./tools/fuchsia/local-sdk.py <fuchsia> x64
Change-Id: I9b73e6cf179b739345ea0d48c5e597de44eef8f1
Reviewed-on: https://chromium-review.googlesource.com/c/1393743Reviewed-by: default avatarFabrice de Gans-Riberi <fdegans@chromium.org>
Reviewed-by: default avatarWez <wez@chromium.org>
Commit-Queue: Aidan Wolter <awolter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619534}
parent 9c8b10b5
...@@ -34,7 +34,7 @@ def EnsureEmptyDir(path): ...@@ -34,7 +34,7 @@ def EnsureEmptyDir(path):
def BuildForArch(arch): def BuildForArch(arch):
build_dir = 'out/release-' + arch build_dir = 'out/release-' + arch
Run('scripts/fx', 'set', arch, Run('scripts/fx', 'set', arch,
'--packages=garnet/packages/sdk/garnet', '--packages=topaz/packages/sdk/topaz',
'--args=is_debug=false', '--args=build_sdk_archives=true', build_dir) '--args=is_debug=false', '--args=build_sdk_archives=true', build_dir)
Run('scripts/fx', 'full-build') Run('scripts/fx', 'full-build')
...@@ -61,7 +61,7 @@ def main(args): ...@@ -61,7 +61,7 @@ def main(args):
tempdir = tempfile.mkdtemp() tempdir = tempfile.mkdtemp()
sdk_tar = os.path.join(fuchsia_root, 'out', 'release-' + arch, 'sdk', sdk_tar = os.path.join(fuchsia_root, 'out', 'release-' + arch, 'sdk',
'archive', 'garnet.tar.gz') 'archive', 'topaz.tar.gz')
# Nuke the SDK from DEPS, put our just-built one there, and set a fake .hash # Nuke the SDK from DEPS, put our just-built one there, and set a fake .hash
# file. This means that on next gclient runhooks, we'll restore to the # file. This means that on next gclient runhooks, we'll restore to the
......
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