diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2019-07-11 19:02:38 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-07-18 06:39:00 -0700 |
| commit | bb895f18962c3f30e5d034861a73d22e6460743e (patch) | |
| tree | 9fd141b8a9cf49a4f03a6a99b181004f09478f1c /packaging | |
| parent | 8a53ad05059760a176317c227ff4c7cb748dcee1 (diff) | |
| download | subsurface-bb895f18962c3f30e5d034861a73d22e6460743e.tar.gz | |
Android: Qt 5.12.4, OpenSSL 1.1.1c
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>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/android/qt-installer-noninteractive.qs | 4 | ||||
| -rw-r--r-- | packaging/android/variables.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packaging/android/qt-installer-noninteractive.qs b/packaging/android/qt-installer-noninteractive.qs index 4cfa65208..f54a354d3 100644 --- a/packaging/android/qt-installer-noninteractive.qs +++ b/packaging/android/qt-installer-noninteractive.qs @@ -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); } diff --git a/packaging/android/variables.sh b/packaging/android/variables.sh index 49802cc8e..0c1b589ac 100644 --- a/packaging/android/variables.sh +++ b/packaging/android/variables.sh @@ -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 |