From 4b5b1fca6f6445d53319059289ff36abbe2a1dd6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Tue, 2 Aug 2016 18:08:48 +0200 Subject: [PATCH] makebs: work around build-tools 24.0.1 version bug The zip contains 24.0.0 as the version, which means our magic was installing 24.0.0 twice and skipping 24.0.1. --- buildserver/provision-android-sdk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/buildserver/provision-android-sdk b/buildserver/provision-android-sdk index 31bb95b2..57eacdc4 100644 --- a/buildserver/provision-android-sdk +++ b/buildserver/provision-android-sdk @@ -41,6 +41,10 @@ done # install all cached build-tools for f in `ls -1 build-tools*.zip`; do ver=`unzip -c $f "*/source.properties" | sed -n 's,^Pkg.Revision=,,p'` + if [[ $ver == 24.0.0 ]] && [[ $f =~ .*r24\.0\.1.* ]]; then + # 24.0.1 has the wrong revision in the zip + ver=24.0.1 + fi cached=,build-tools-${ver}${cached} done -- 2.30.2