diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-07-16 16:59:48 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-07-18 06:39:00 -0700 |
| commit | a236dd4fd2f2a4925ad4f94075de96126980eb83 (patch) | |
| tree | 883b3c21ddb9052c00658db0f7128a68e0f70a35 | |
| parent | 7dcfc9d96b090d2dd8d7916f8016126bada8f17e (diff) | |
| download | subsurface-a236dd4fd2f2a4925ad4f94075de96126980eb83.tar.gz | |
Android: hack around the build issue with a custom container
Local testing seems to indicate that the build should work with this container.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | scripts/android/before_install.sh | 2 | ||||
| -rw-r--r-- | scripts/docker/android-build-container/Dockerfile | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/android/before_install.sh b/scripts/android/before_install.sh index 32611d448..c9638a362 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.04 \ + -d dirkhh/android-builder:5.12.04.1 \ /bin/sleep 60m diff --git a/scripts/docker/android-build-container/Dockerfile b/scripts/docker/android-build-container/Dockerfile index fd47de481..5b9f88f7c 100644 --- a/scripts/docker/android-build-container/Dockerfile +++ b/scripts/docker/android-build-container/Dockerfile @@ -53,4 +53,5 @@ RUN cd /android && \ ls -l && \ du -sh * RUN apt-get clean +RUN cd /android/android-ndk-r18b/toolchains && ln -s x86_64-4.9 x86-64-4.9 RUN touch /android/finished-`date` |