diff options
| -rwxr-xr-x | packaging/android/android-build-wrapper.sh | 2 | ||||
| -rw-r--r-- | packaging/android/qt-installer-noninteractive.qs | 3 | ||||
| -rw-r--r-- | scripts/docker/android-build-container/Dockerfile | 9 |
3 files changed, 8 insertions, 6 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index e6b43d1e4..e673b39e8 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -121,7 +121,7 @@ if [ ! -d Qt/"${LATEST_QT}"/android_armv7 ] ; then $SLOW_PROG wget -q "${QT_DOWNLOAD_URL}" fi 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 # patch the cmake / Qt5.7.1 incompatibility mentioned above diff --git a/packaging/android/qt-installer-noninteractive.qs b/packaging/android/qt-installer-noninteractive.qs index b0ec88022..4cfa65208 100644 --- a/packaging/android/qt-installer-noninteractive.qs +++ b/packaging/android/qt-installer-noninteractive.qs @@ -32,7 +32,8 @@ Controller.prototype.ComponentSelectionPageCallback = function() { var widget = gui.currentPageWidget(); 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); } diff --git a/scripts/docker/android-build-container/Dockerfile b/scripts/docker/android-build-container/Dockerfile index b03a0a05a..4410f4b91 100644 --- a/scripts/docker/android-build-container/Dockerfile +++ b/scripts/docker/android-build-container/Dockerfile @@ -20,13 +20,14 @@ RUN apt-get update && \ openjdk-8-jdk RUN mkdir -p /android -ADD qt-opensource-linux-x64-5.11.1.run /android/ -ADD android-ndk-r14b-linux-x86_64.zip /android/ +ADD qt-opensource-linux-x64-5.*.run /android/ +ADD android-ndk-r*-linux-x86_64.zip /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 && \ - rm -f qt-opensource-linux-x64-5.11.1.run android-ndk-r14b-linux-x86_64.zip && \ - rm -rf android-sdk-linux/emulator Qt/Docs Qt/Tools Qt/Examples && \ + rm -f qt-opensource-linux-x64-*.run android-ndk-r*-linux-x86_64.zip && \ + 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 android-ndk*/toolchains/x86-* android-ndk*/toolchains/llvm/prebuilt/x86-* && \ ls -l && \ du -sh * |