From d3e495efd006abe5af03e396499bfcf60135a3e2 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 24 Apr 2020 15:27:40 -0700 Subject: build-system/Android: use PREFIX outside of NDK If we install our support libraries into the NDK we later run into include path order issues that result in strange errors around the inclusion of math.h (because we find the C version of that include file that ships with the NDK before we find the libstdc++ version of math.h (because the include path for our support libraries is listed before the libstdc++ include search path). By having a distinct install-root for our libraries we can avoid this problem. Remove the previous hack that tried to work around the symptoms of this issue. Signed-off-by: Dirk Hohndel --- scripts/docker/android-build-container/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'scripts/docker/android-build-container') diff --git a/scripts/docker/android-build-container/Dockerfile b/scripts/docker/android-build-container/Dockerfile index 509443f85..1fcc1aa76 100644 --- a/scripts/docker/android-build-container/Dockerfile +++ b/scripts/docker/android-build-container/Dockerfile @@ -37,10 +37,6 @@ RUN cd /android/cmake-3.13.2 && \ # 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-r21/sources/cxx-stl/llvm-libc++/include/cmath - # clean up the files that we don't need to keep the container smaller RUN cd /android && \ apt-get remove -y gcc g++-7 libstdc++-7-dev && \ -- cgit v1.2.3-70-g09d2