From bb895f18962c3f30e5d034861a73d22e6460743e Mon Sep 17 00:00:00 2001 From: Jan Mulder Date: Thu, 11 Jul 2019 19:02:38 +0200 Subject: [PATCH] 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 --- packaging/android/qt-installer-noninteractive.qs | 4 ++-- packaging/android/variables.sh | 6 +++--- scripts/get-dep-lib.sh | 2 +- 3 files changed, 6 insertions(+), 6 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 diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index ccda4bcb7..1387b2293 100755 --- a/scripts/get-dep-lib.sh +++ b/scripts/get-dep-lib.sh @@ -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)