mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android build: set newer versions and parameterize ANDROID_PLATFORM

Browse source 
Hard coding desired ANDROID_PLATFORM on multiple places is simply bad.
Fix this. Further, set the variables to a much newer state.

CAVEAT: this will likely break android build, so be careful on
bisecting. All fixed in next, related commits.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2018-11-24 10:03:50 +01:00 • committed by Dirk Hohndel
parent f3967e5c3f
commit cb815b5bb6
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packaging/android/variables.sh
View file

@ -1,11 +1,13 @@
#!/bin/bash
# When changing Qt version remember to update the
# qt-installer-noninteractive file as well.
QT_VERSION=5.11
LATEST_QT=5.11.1
NDK_VERSION=r14b
SDK_VERSION=3859397
ANDROID_BUILDTOOLS_REVISION=25.0.3
QT_VERSION=5.12
LATEST_QT=5.12.0
NDK_VERSION=r18b
SDK_VERSION=4333796
ANDROID_BUILDTOOLS_REVISION=28.0.2
ANDROID_PLATFORM_LEVEL=21
ANDROID_PLATFORM=android-21
ANDROID_PLATFORMS=android-27
ANDROID_NDK=android-ndk-${NDK_VERSION}
ANDROID_SDK=android-sdk-linux