Skip to content

Commit

Permalink
[fuchsia] Update the local-sdk.py script.
Browse files Browse the repository at this point in the history
* The sdk_image build configuration was removed from the Fuchsia
  tree.
* The tools bundle now needs to be explicitly included in the QEMU
  images by using the --with-base command line argument.

Change-Id: I62f4d17dc792ed4506e7743efd3f6efc01ea0462
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1585064
Reviewed-by: Kevin Marshall <kmarshall@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Commit-Queue: Fabrice de Gans-Riberi <fdegans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#655767}
  • Loading branch information
Steelskin authored and Commit Bot committed May 1, 2019
1 parent 1a85c30 commit 778dd75
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tools/fuchsia/local-sdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ def EnsureEmptyDir(path):

def BuildForArch(arch):
build_dir = 'out/release-' + arch
Run('scripts/fx', '--dir', build_dir, 'set', 'sdk_image.' + arch,
'--with=//topaz/packages/sdk:topaz', '--args=is_debug=false',
'--args=build_sdk_archives=true')
Run('scripts/fx', '--dir', build_dir, 'set', 'terminal.' + arch,
'--with=//topaz/packages/sdk:topaz', '--with-base=//sdk/bundles:tools',
'--args=is_debug=false', '--args=build_sdk_archives=true')
Run('scripts/fx', 'build', 'topaz/public/sdk:topaz', 'sdk:images_archive')


Expand Down

0 comments on commit 778dd75

Please sign in to comment.