From d3e495efd006abe5af03e396499bfcf60135a3e2 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
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 <dirk@hohndel.org>
---
 packaging/android/build.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'packaging/android')

diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index d91df58b0..42d208587 100755
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -143,9 +143,11 @@ fi
 if [ ! -e ndk-"$ARCH" ] ; then
 	"$ANDROID_NDK_ROOT/build/tools/make_standalone_toolchain.py" --arch="$ARCH" --install-dir=ndk-"$ARCH" --api=$ANDROID_PLATFORM_LEVEL
 fi
+
 export BUILDROOT=$PWD
+mkdir -p "${BUILDROOT}"/install-root-"${ARCH}"
+export PREFIX="${BUILDROOT}"/install-root-"${ARCH}"
 export PATH=${BUILDROOT}/ndk-$ARCH/bin:$PATH
-export PREFIX=${BUILDROOT}/ndk-$ARCH/sysroot/usr
 export PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig
 export CC=${BUILDROOT}/ndk-$ARCH/bin/clang
 export CXX=${BUILDROOT}/ndk-$ARCH/bin/clang++
@@ -261,7 +263,7 @@ if [ "$QUICK" = "" ] ; then
 		popd
 	fi
 
-"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libzip
+	"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libzip
 	if [ ! -e "$PKG_CONFIG_LIBDIR/libzip.pc" ] ; then
 		# libzip expects a predefined macro that isn't there for our compiler
 		pushd libzip
@@ -302,7 +304,7 @@ if [ "$QUICK" = "" ] ; then
 			-DUSE_SSH=OFF \
 			-DOPENSSL_SSL_LIBRARY="$PREFIX"/lib/libssl_1_1.so \
 			-DOPENSSL_CRYPTO_LIBRARY="$PREFIX"/lib/libcrypto_1_1.so \
-			-DOPENSSL_INCLUDE_DIR="$PREFIX"/include/openssl \
+			-DOPENSSL_INCLUDE_DIR="$PREFIX"/include \
 			-D_OPENSSL_VERSION="${OPENSSL_VERSION}" \
 			-DCMAKE_DISABLE_FIND_PACKAGE_HTTP_Parser=TRUE \
 			../libgit2/
@@ -407,8 +409,8 @@ cmake $MOBILE_CMAKE \
 	-DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
 	-DMAKE_TESTS=OFF \
 	-DFTDISUPPORT=OFF \
-	-DANDROID_NATIVE_LIBSSL="$BUILDROOT/ndk-$ARCH/sysroot/usr/lib/libssl_1_1.so" \
-	-DANDROID_NATIVE_LIBCRYPT="$BUILDROOT/ndk-$ARCH/sysroot/usr/lib/libcrypto_1_1.so" \
+	-DANDROID_NATIVE_LIBSSL="$PREFIX/lib/libssl_1_1.so" \
+	-DANDROID_NATIVE_LIBCRYPT="$PREFIX/lib/libcrypto_1_1.so" \
 	-DCMAKE_MAKE_PROGRAM="make" \
 	"$SUBSURFACE_SOURCE"
 
-- 
cgit v1.2.3-70-g09d2