diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-07-13 18:29:13 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-07-18 06:39:00 -0700 |
| commit | 7dcfc9d96b090d2dd8d7916f8016126bada8f17e (patch) | |
| tree | 2b4e0f63f7ffba26cb9b46f71f67cb397d58e8c2 /scripts | |
| parent | 9a70c260e8b7f600c567fe4f09d759f6abe54d02 (diff) | |
| download | subsurface-7dcfc9d96b090d2dd8d7916f8016126bada8f17e.tar.gz | |
Android: Switch to Qt 5.12.4 container
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/android/before_install.sh | 2 | ||||
| -rw-r--r-- | scripts/docker/android-build-container/Dockerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/android/before_install.sh b/scripts/android/before_install.sh index a903b1fc0..32611d448 100644 --- a/scripts/android/before_install.sh +++ b/scripts/android/before_install.sh @@ -19,5 +19,5 @@ docker run -v $PWD:/android/subsurface \ -v $PARENT/subsurface-mobile-build-docker-arm64:/android/subsurface-mobile-build-arm64 \ --name=android-builder \ -w /android \ - -d dirkhh/android-builder:5.12.03 \ + -d dirkhh/android-builder:5.12.04 \ /bin/sleep 60m diff --git a/scripts/docker/android-build-container/Dockerfile b/scripts/docker/android-build-container/Dockerfile index 53039399e..fd47de481 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.*.run /android/ +ADD qt-opensource-linux-x64-5.12.4.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/ |