diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-11-24 10:03:50 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-22 13:02:39 +1300 |
| commit | 78d11ed687bd21d479e049442efdc4877b89f5f7 (patch) | |
| tree | 70ad9c4219a75ae967050f5c93512a8fd24088f3 /packaging/android/variables.sh | |
| parent | 12192257297e7f67e994d107fc54b4d4e2f94d57 (diff) | |
| download | subsurface-78d11ed687bd21d479e049442efdc4877b89f5f7.tar.gz | |
Android build: set newer versions and parameterize ANDROID_PLATFORM
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>
Diffstat (limited to 'packaging/android/variables.sh')
| -rw-r--r-- | packaging/android/variables.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/packaging/android/variables.sh b/packaging/android/variables.sh index 0fde53bbb..49802cc8e 100644 --- a/packaging/android/variables.sh +++ b/packaging/android/variables.sh @@ -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 |