mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android: update for Qt 5.12.0

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-12-23 15:22:02 -08:00
parent cdee2fde64
commit 2d7ffd4eff
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/android/android-build-wrapper.sh
View file

@ -121,7 +121,7 @@ if [ ! -d Qt/"${LATEST_QT}"/android_armv7 ] ; then
$SLOW_PROG wget -q "${QT_DOWNLOAD_URL}" $SLOW_PROG wget -q "${QT_DOWNLOAD_URL}"
fi fi
chmod +x ./"${QT_BINARIES}" chmod +x ./"${QT_BINARIES}"
./"${QT_BINARIES}" --platform minimal --script "$SCRIPTDIR"/qt-installer-noninteractive.qs --no-force-installations -v ./"${QT_BINARIES}" --platform minimal --script "$SCRIPTDIR"/qt-installer-noninteractive.qs --no-force-installations
fi fi
# patch the cmake / Qt5.7.1 incompatibility mentioned above # patch the cmake / Qt5.7.1 incompatibility mentioned above

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

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

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

@ -20,13 +20,14 @@ RUN apt-get update && \
openjdk-8-jdk openjdk-8-jdk
RUN mkdir -p /android RUN mkdir -p /android
ADD qt-opensource-linux-x64-5.11.1.run /android/ ADD qt-opensource-linux-x64-5.*.run /android/
ADD android-ndk-r14b-linux-x86_64.zip /android/ ADD android-ndk-r*-linux-x86_64.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/
RUN cd /android && bash -x /android/android-build-wrapper.sh -prep-only && \ RUN cd /android && bash -x /android/android-build-wrapper.sh -prep-only && \
rm -f qt-opensource-linux-x64-5.11.1.run android-ndk-r14b-linux-x86_64.zip && \ rm -f qt-opensource-linux-x64-*.run android-ndk-r*-linux-x86_64.zip && \
rm -rf android-sdk-linux/emulator Qt/Docs Qt/Tools Qt/Examples && \ rm -rf android-sdk-linux/emulator Qt/[a-zA-Z]* && \
rm -rf $( find android-ndk*/platforms -name arch-mips -o -name arch-x86 ) && \ rm -rf $( find android-ndk*/platforms -name arch-mips -o -name arch-x86 ) && \
rm -rf android-ndk*/toolchains/x86-* android-ndk*/toolchains/llvm/prebuilt/x86-* && \
ls -l && \ ls -l && \
du -sh * du -sh *