diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-12-23 15:22:02 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-12-30 11:20:34 -0800 |
| commit | 2d7ffd4eff7b41a34f6ef26cd6fa258c69a4e238 (patch) | |
| tree | 52729bca0e1a1a61a69960043a9f794d3296914b /scripts/docker/android-build-container/Dockerfile | |
| parent | cdee2fde6480549195c819c0dd484883cb4b5d95 (diff) | |
| download | subsurface-2d7ffd4eff7b41a34f6ef26cd6fa258c69a4e238.tar.gz | |
Android: update for Qt 5.12.0
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/docker/android-build-container/Dockerfile')
| -rw-r--r-- | scripts/docker/android-build-container/Dockerfile | 9 |
1 files changed, 5 insertions, 4 deletions
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 * |