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

Android: Qt 5.12.4, OpenSSL 1.1.1c

Browse source 
The main reason for upgrading of the Qt version is the hunt for a broken
BT/BLE stack, preventing downloads from BT/BLE enabled DCs, in relation
to arm64 architecture builds. (And the absolute need for an arm64 build
in relation to the publication of the Android app in  Googles Play
store).

In addition, Qt 5.12.4 starts supporting OpenSSL 1.1.1c, and trying to
use our current OpenSSL 1.0 series is highly discouraged by Qt (and
OpenSSL itself).

So, upgrade both in unison. But ... be careful bisecting issues on this
commit, as it does break our build. That will be fixed in the next
commit.

This fixes the BT/BLE download for arm64!

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2019-07-11 19:02:38 +02:00 • committed by Dirk Hohndel
parent 8a53ad0505
commit bb895f1896
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packaging/android/qt-installer-noninteractive.qs
View file

@ -32,8 +32,8 @@ Controller.prototype.ComponentSelectionPageCallback = function() {
var widget = gui.currentPageWidget();
widget.deselectAll();
widget.selectComponent('qt.qt5.5120.android_armv7');
widget.selectComponent('qt.qt5.5120.android_arm64_v8a');
widget.selectComponent('qt.qt5.5124.android_armv7');
widget.selectComponent('qt.qt5.5124.android_arm64_v8a');
gui.clickButton(buttons.NextButton);
}

6
packaging/android/variables.sh
View file

@ -2,10 +2,10 @@
# When changing Qt version remember to update the
# qt-installer-noninteractive file as well.
QT_VERSION=5.12
LATEST_QT=5.12.0
LATEST_QT=5.12.4
NDK_VERSION=r18b
SDK_VERSION=4333796
ANDROID_BUILDTOOLS_REVISION=28.0.2
ANDROID_BUILDTOOLS_REVISION=28.0.3
ANDROID_PLATFORM_LEVEL=21
ANDROID_PLATFORM=android-21
ANDROID_PLATFORMS=android-27
@ -13,4 +13,4 @@ ANDROID_NDK=android-ndk-${NDK_VERSION}
ANDROID_SDK=android-sdk-linux
# OpenSSL also has an entry in get-dep-lib.sh line 103
# that needs to be updated as well.
OPENSSL_VERSION=1.0.2o
OPENSSL_VERSION=1.1.1c

2
scripts/get-dep-lib.sh
View file

@ -103,7 +103,7 @@ fi
# FIX FOR ANDROID,
if [ "$PLATFORM" == "singleAndroid" ] ; then
CURRENT_OPENSSL="OpenSSL_1_0_2o"
CURRENT_OPENSSL="OpenSSL_1_1_1c"
# If changing the openSSL version here, make sure to change it in versions.sh also.
fi
# no curl and old libs (never version breaks)