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

builld-system: switch Android to Qt 5.13.1

Browse source 
This fixes the SSL issue with Android 5.x/Lollipop.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-10-04 09:13:05 -07:00
parent 4458373488
commit ea0e447e0d
4 changed files with 11 additions and 5 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(); var widget = gui.currentPageWidget();
widget.deselectAll(); widget.deselectAll();
widget.selectComponent('qt.qt5.5124.android_armv7'); widget.selectComponent('qt.qt5.5131.android_armv7');
widget.selectComponent('qt.qt5.5124.android_arm64_v8a'); widget.selectComponent('qt.qt5.5131.android_arm64_v8a');
gui.clickButton(buttons.NextButton); gui.clickButton(buttons.NextButton);
} }

4
packaging/android/variables.sh
View file

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
# When changing Qt version remember to update the # When changing Qt version remember to update the
# qt-installer-noninteractive file as well. # qt-installer-noninteractive file as well.
QT_VERSION=5.12 QT_VERSION=5.13
LATEST_QT=5.12.4 LATEST_QT=5.13.1
NDK_VERSION=r18b NDK_VERSION=r18b
SDK_VERSION=4333796 SDK_VERSION=4333796
ANDROID_BUILDTOOLS_REVISION=28.0.3 ANDROID_BUILDTOOLS_REVISION=28.0.3

2
scripts/docker/android-build-container/Dockerfile
View file

@ -22,7 +22,7 @@ RUN apt-get update && \
# install, NDK and SDK there, plus the three files from the Subsurface # install, NDK and SDK there, plus the three files from the Subsurface
# sources that we need to get the prep routines to run # sources that we need to get the prep routines to run
RUN mkdir -p /android 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 android-ndk-r*-linux-x86_64.zip /android/
ADD sdk-tools-linux-*.zip /android/ ADD sdk-tools-linux-*.zip /android/
ADD android-build-wrapper.sh variables.sh qt-installer-noninteractive.qs /android/ ADD android-build-wrapper.sh variables.sh qt-installer-noninteractive.qs /android/

6
scripts/docker/android-build-container/download.sh Executable file
View file

@ -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