mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android: Switch to Qt 5.12.4 container

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-07-13 18:29:13 -07:00
parent 9a70c260e8
commit 7dcfc9d96b
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/android/before_install.sh
View file

@ -19,5 +19,5 @@ docker run -v $PWD:/android/subsurface \
-v $PARENT/subsurface-mobile-build-docker-arm64:/android/subsurface-mobile-build-arm64 \ -v $PARENT/subsurface-mobile-build-docker-arm64:/android/subsurface-mobile-build-arm64 \
--name=android-builder \ --name=android-builder \
-w /android \ -w /android \
-d dirkhh/android-builder:5.12.03 \ -d dirkhh/android-builder:5.12.04 \
/bin/sleep 60m /bin/sleep 60m

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.*.run /android/ ADD qt-opensource-linux-x64-5.12.4.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/