From 071bce0fd141f7d7e5a83248b6e67f79d8acd897 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 24 Dec 2018 09:15:21 -0800 Subject: Android Dockerfile: ugly hack to deal with current NDK compile problems As explained in commit 449d4ee33d ("Android build: add explanation for huge hack"). It seems reasonable to add this to our Travis image as that is custom made just to build our Android binaries. Signed-off-by: Dirk Hohndel --- scripts/docker/android-build-container/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts/docker/android-build-container/Dockerfile') diff --git a/scripts/docker/android-build-container/Dockerfile b/scripts/docker/android-build-container/Dockerfile index afa317009..9597e20db 100644 --- a/scripts/docker/android-build-container/Dockerfile +++ b/scripts/docker/android-build-container/Dockerfile @@ -31,6 +31,10 @@ ADD android-build-wrapper.sh variables.sh qt-installer-noninteractive.qs /androi # run the build wrapper in prep mode RUN cd /android && bash -x /android/android-build-wrapper.sh -prep-only +# uggly hack to work around some breakage in the NDK which makes our +# compiles fail +RUN sed -i '313,+13s/^using/\/\/using/' /android/android-ndk-r18b/sources/cxx-stl/llvm-libc++/include/cmath + # clean up the files that we don't need to keep the container smaller RUN cd /android && \ rm -rf qt-opensource-linux-x64-*.run \ -- cgit v1.2.3-70-g09d2