Commit f4214156 authored by Sergey Ulanov's avatar Sergey Ulanov Committed by Commit Bot

Update local-sdk.py to build aarch64

makesdk.go now expects aarch64 builds, but local-sdk.py wasn't building
it. Updated it to build both i86-64 and aarch64

Change-Id: I6598010205bd6dbe1da522dcd0455a0df267a73d
Reviewed-on: https://chromium-review.googlesource.com/703997Reviewed-by: default avatarWez <wez@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506922}
parent b693f2dc
...@@ -30,6 +30,13 @@ def EnsureEmptyDir(path): ...@@ -30,6 +30,13 @@ def EnsureEmptyDir(path):
os.makedirs(path) os.makedirs(path)
def BuildForArch(arch):
Run('scripts/build-zircon.sh', '-t', arch)
Run('packages/gn/gen.py', '--target_cpu=' + arch, '--modules=packages/gn/sdk',
'--ignore-skia', '--release')
Run('buildtools/ninja', '-C', 'out/release-' + arch)
def main(args): def main(args):
if len(args) != 1 or not os.path.isdir(args[0]): if len(args) != 1 or not os.path.isdir(args[0]):
print 'usage: %s <path_to_fuchsia_tree>' % SELF_FILE print 'usage: %s <path_to_fuchsia_tree>' % SELF_FILE
...@@ -41,11 +48,10 @@ def main(args): ...@@ -41,11 +48,10 @@ def main(args):
# Switch to the Fuchsia tree and build an SDK. # Switch to the Fuchsia tree and build an SDK.
os.chdir(fuchsia_root) os.chdir(fuchsia_root)
Run('scripts/build-zircon.sh', '-t', 'x86_64')
Run('scripts/build-zircon.sh', '-t', 'aarch64') BuildForArch('x86-64')
Run('packages/gn/gen.py', '--target_cpu=x86-64', '--modules=packages/gn/sdk', BuildForArch('aarch64')
'--ignore-skia', '--release')
Run('packages/gn/build.py', '--release')
tempdir = tempfile.mkdtemp() tempdir = tempfile.mkdtemp()
sdk_tar = os.path.join(tempdir, 'fuchsia-sdk.tgz') sdk_tar = os.path.join(tempdir, 'fuchsia-sdk.tgz')
Run('go', 'run', 'scripts/makesdk.go', '-output', sdk_tar, '.') Run('go', 'run', 'scripts/makesdk.go', '-output', sdk_tar, '.')
......
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