diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-10-04 09:13:05 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-10-05 08:19:31 -0700 |
| commit | ea0e447e0dec06a7063cbe435d7f8498d5a5fba7 (patch) | |
| tree | 1d0ed80a1f224d86b3fa4ce714b3fc04a9bdae4f | |
| parent | 44583734886db665ea3d5964a1b2705fe0a0f4b6 (diff) | |
| download | subsurface-ea0e447e0dec06a7063cbe435d7f8498d5a5fba7.tar.gz | |
builld-system: switch Android to Qt 5.13.1
This fixes the SSL issue with Android 5.x/Lollipop.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | packaging/android/qt-installer-noninteractive.qs | 4 | ||||
| -rw-r--r-- | packaging/android/variables.sh | 4 | ||||
| -rw-r--r-- | scripts/docker/android-build-container/Dockerfile | 2 | ||||
| -rwxr-xr-x | scripts/docker/android-build-container/download.sh | 6 |
4 files changed, 11 insertions, 5 deletions
diff --git a/packaging/android/qt-installer-noninteractive.qs b/packaging/android/qt-installer-noninteractive.qs index f54a354d3..4b679e519 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.5124.android_armv7'); - widget.selectComponent('qt.qt5.5124.android_arm64_v8a'); + widget.selectComponent('qt.qt5.5131.android_armv7'); + widget.selectComponent('qt.qt5.5131.android_arm64_v8a'); gui.clickButton(buttons.NextButton); } diff --git a/packaging/android/variables.sh b/packaging/android/variables.sh index 0c1b589ac..a3c3dcdfc 100644 --- a/packaging/android/variables.sh +++ b/packaging/android/variables.sh @@ -1,8 +1,8 @@ #!/bin/bash # When changing Qt version remember to update the # qt-installer-noninteractive file as well. -QT_VERSION=5.12 -LATEST_QT=5.12.4 +QT_VERSION=5.13 +LATEST_QT=5.13.1 NDK_VERSION=r18b SDK_VERSION=4333796 ANDROID_BUILDTOOLS_REVISION=28.0.3 diff --git a/scripts/docker/android-build-container/Dockerfile b/scripts/docker/android-build-container/Dockerfile index 2b7107601..62363d559 100644 --- a/scripts/docker/android-build-container/Dockerfile +++ b/scripts/docker/android-build-container/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get update && \ # install, NDK and SDK there, plus the three files from the Subsurface # sources that we need to get the prep routines to run RUN mkdir -p /android -ADD qt-opensource-linux-x64-5.12.4.run /android/ +ADD qt-opensource-linux-x64-5.13.1.run /android/ ADD android-ndk-r*-linux-x86_64.zip /android/ ADD sdk-tools-linux-*.zip /android/ ADD android-build-wrapper.sh variables.sh qt-installer-noninteractive.qs /android/ diff --git a/scripts/docker/android-build-container/download.sh b/scripts/docker/android-build-container/download.sh new file mode 100755 index 000000000..fffaeb18f --- /dev/null +++ b/scripts/docker/android-build-container/download.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +wget https://download.qt.io/official_releases/qt/5.13/5.13.1/qt-opensource-linux-x64-5.13.1.run +wget https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip +wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip +wget https://ftp.osuosl.org/pub/blfs/conglomeration/cmake/cmake-3.13.2.tar.gz |