aboutsummaryrefslogtreecommitdiff
path: root/libc/ci/android-sysimage.sh
diff options
context:
space:
mode:
authorDaniel Mueller <deso@posteo.net>2018-12-10 21:00:27 -0800
committerDaniel Mueller <deso@posteo.net>2018-12-10 21:00:27 -0800
commite2604a756aaddcd5919ee2f1b9cc0055d200f846 (patch)
tree1ea1b9900db20d3aadbddbce18882d0c957247d7 /libc/ci/android-sysimage.sh
parent5875df6c958743cf86c75b2cb5fc2efe5ca0de43 (diff)
downloadnitrocli-e2604a756aaddcd5919ee2f1b9cc0055d200f846.tar.gz
nitrocli-e2604a756aaddcd5919ee2f1b9cc0055d200f846.tar.bz2
Update libc crate to 0.2.45
This change updates the libc crate to version 0.2.45. Import subrepo libc/:libc at f5636fc618f8e16968b3178196d73c94ad9f7b05
Diffstat (limited to 'libc/ci/android-sysimage.sh')
-rw-r--r--libc/ci/android-sysimage.sh40
1 files changed, 22 insertions, 18 deletions
diff --git a/libc/ci/android-sysimage.sh b/libc/ci/android-sysimage.sh
index 9611dfe..9eabd7c 100644
--- a/libc/ci/android-sysimage.sh
+++ b/libc/ci/android-sysimage.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
# Copyright 2017 The Rust Project Developers. See the COPYRIGHT
# file at the top-level directory of this distribution and at
# http://rust-lang.org/COPYRIGHT.
@@ -13,32 +15,34 @@ set -ex
URL=https://dl.google.com/android/repository/sys-img/android
main() {
- local arch=$1
- local name=$2
+ local arch="${1}"
+ local name="${2}"
local dest=/system
- local td=$(mktemp -d)
+ local td
+ td="$(mktemp -d)"
apt-get install --no-install-recommends e2tools
- pushd $td
- curl -O $URL/$name
- unzip -q $name
+ pushd "${td}"
+ curl --retry 5 -O "${URL}/${name}"
+ unzip -q "${name}"
- local system=$(find . -name system.img)
- mkdir -p $dest/{bin,lib,lib64}
+ local system
+ system="$(find . -name system.img)"
+ mkdir -p ${dest}/{bin,lib,lib64}
# Extract android linker and libraries to /system
# This allows android executables to be run directly (or with qemu)
- if [ $arch = "x86_64" -o $arch = "arm64" ]; then
- e2cp -p $system:/bin/linker64 $dest/bin/
- e2cp -p $system:/lib64/libdl.so $dest/lib64/
- e2cp -p $system:/lib64/libc.so $dest/lib64/
- e2cp -p $system:/lib64/libm.so $dest/lib64/
+ if [ "${arch}" = "x86_64" ] || [ "${arch}" = "arm64" ]; then
+ e2cp -p "${system}:/bin/linker64" "${dest}/bin/"
+ e2cp -p "${system}:/lib64/libdl.so" "${dest}/lib64/"
+ e2cp -p "${system}:/lib64/libc.so" "${dest}/lib64/"
+ e2cp -p "${system}:/lib64/libm.so" "${dest}/lib64/"
else
- e2cp -p $system:/bin/linker $dest/bin/
- e2cp -p $system:/lib/libdl.so $dest/lib/
- e2cp -p $system:/lib/libc.so $dest/lib/
- e2cp -p $system:/lib/libm.so $dest/lib/
+ e2cp -p "${system}:/bin/linker" "${dest}/bin/"
+ e2cp -p "${system}:/lib/libdl.so" "${dest}/lib/"
+ e2cp -p "${system}:/lib/libc.so" "${dest}/lib/"
+ e2cp -p "${system}:/lib/libm.so" "${dest}/lib/"
fi
# clean up
@@ -46,7 +50,7 @@ main() {
popd
- rm -rf $td
+ rm -rf "${td}"
}
main "${@}"