mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 20:43:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Travis: hack around Android build failuers

Browse source 
For some reason accepting the licenses for the SDK appears to fail.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-12-24 12:41:49 -08:00
parent 9df88f0145
commit 5eec251be8
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packaging/android/android-build-wrapper.sh
View file

@ -13,6 +13,8 @@
# Qt/5.9/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake # Qt/5.9/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake
# (this script tries to do this automatically) # (this script tries to do this automatically)
set -x # make debugging Travis easier
exec 1> >(tee ./build.log) 2>&1 exec 1> >(tee ./build.log) 2>&1
USE_X=$(case $- in *x*) echo "-x" ;; esac) USE_X=$(case $- in *x*) echo "-x" ;; esac)
@ -22,7 +24,7 @@ USE_X=$(case $- in *x*) echo "-x" ;; esac)
QT_VERSION=5.9 QT_VERSION=5.9
LATEST_QT=5.9.1 LATEST_QT=5.9.1
NDK_VERSION=r14b NDK_VERSION=r14b
SDK_VERSION=3859397 SDK_VERSION=3859397 # if you change this version, you'll likely have to change the android-sdk-license key fallback below
ANDROID_NDK=android-ndk-${NDK_VERSION} ANDROID_NDK=android-ndk-${NDK_VERSION}
ANDROID_SDK=android-sdk-linux ANDROID_SDK=android-sdk-linux
@ -75,7 +77,9 @@ if [ ! -d $ANDROID_SDK ] ; then
mkdir $ANDROID_SDK mkdir $ANDROID_SDK
pushd $ANDROID_SDK pushd $ANDROID_SDK
unzip -q ../$SDK_TOOLS unzip -q ../$SDK_TOOLS
yes | tools/bin/sdkmanager --licenses yes | tools/bin/sdkmanager --licenses > /dev/null 2>&1 || echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > licenses/android-sdk-license
cat licenses/android-sdk-license
echo ""
# FIXME: Read these from build.sh varables, or install them there. # FIXME: Read these from build.sh varables, or install them there.
tools/bin/sdkmanager tools platform-tools 'platforms;android-27' 'build-tools;25.0.3' tools/bin/sdkmanager tools platform-tools 'platforms;android-27' 'build-tools;25.0.3'
popd popd