From 9cb5aa40fb4dd9ad968b82d251026b3c2471de01 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 26 Jan 2014 07:59:55 +0200 Subject: Download overlays ASAP to fail fast in case of error. Change-Id: I8d6194e65d2190a9f4de8a2a17faa6d78c0aabd8 --- build-scripts/build-android | 5 +++++ build-scripts/helpers | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'build-scripts') diff --git a/build-scripts/build-android b/build-scripts/build-android index d5ed46f..2ababf1 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -33,6 +33,11 @@ if [ -n "$BUILD_COPYCAT" ]; then else + # Download overlays ASAP for fail-fast approach + if [ -n "$SOURCE_OVERLAY" ]; then + download_overlays "$SOURCE_OVERLAY" + fi + if [ -n "$REPO_SEED_URL" ]; then repo-sync-from-seed "${1}" else diff --git a/build-scripts/helpers b/build-scripts/helpers index 5165e00..7c826b5 100644 --- a/build-scripts/helpers +++ b/build-scripts/helpers @@ -144,13 +144,22 @@ flatten_artifacts () { fi } -unpack_overlays () { +# Keep download and unpack overlays split, to download soon after start +# to catch error fast, but preserve ability overwrite something. +download_overlays () { local ifs_save="$IFS" IFS=";" for p in $1; do curl --silent --show-error \ -b license_accepted_$SOURCE_OVERLAY_ACCEPT_LICENSE=yes \ http://snapshots.linaro.org/android/binaries/$p > $(basename $p) + done + IFS="$ifs_save" +} +unpack_overlays () { + local ifs_save="$IFS" + IFS=";" + for p in $1; do tar -x -a -f $(basename $p) -C . done IFS="$ifs_save" -- cgit v1.2.3