aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jan Mulder <jlmulder@xs4all.nl>2018-12-06 14:11:53 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-12-06 21:53:02 +0100
commitb6d5dacd51bb7fcab417c40a7aa48f0a63693621 (patch)
tree65642dab8332b4faf5ad7d19fabaef9abfe15b8b
parent6c872931d581cb6c3cf3565a36764be3c6b9783f (diff)
downloadsubsurface-b6d5dacd51bb7fcab417c40a7aa48f0a63693621.tar.gz
Android build: explicitly install using sdkmanager
Make sure all required Android SDK components are explicitly installed before starting the actual build. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
-rwxr-xr-xpackaging/android/android-build-wrapper.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh
index 16d50ce82..999cca221 100755
--- a/packaging/android/android-build-wrapper.sh
+++ b/packaging/android/android-build-wrapper.sh
@@ -83,6 +83,7 @@ if [ ! -d "$ANDROID_SDK"/build-tools/"${ANDROID_BUILDTOOLS_REVISION}" ] ; then
unzip -q ../"$SDK_TOOLS"
yes | tools/bin/sdkmanager --licenses > /dev/null 2>&1 || echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > licenses/android-sdk-license
cat licenses/android-sdk-license
+ tools/bin/sdkmanager tools platform-tools 'platforms;'"${ANDROID_PLATFORMS}" 'build-tools;'"${ANDROID_BUILDTOOLS_REVISION}"
echo ""
else
pushd "$ANDROID_SDK"