From bf10b566383e67b7a26d1dc80bb3bc613168c1b5 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Thu, 2 Jan 2020 01:54:40 +0000 Subject: Fix android builds (#4432) * Terminate android build script early if any step fails * Remove deprecated android types * Use android NDK cmake support rather than cmake android NDK support as that support is better supported * Android uses GNU strerror_r? * Fix compilation * Rebase * Fix final issues * Drop submodule changes * Revert change * Parentheses * Lower api levels * Don't use GNU strerror_r for Android Co-authored-by: Mat --- src/OSSupport/Errors.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/OSSupport/Errors.cpp') diff --git a/src/OSSupport/Errors.cpp b/src/OSSupport/Errors.cpp index a6a66c73c..df94d34da 100644 --- a/src/OSSupport/Errors.cpp +++ b/src/OSSupport/Errors.cpp @@ -22,7 +22,7 @@ AString GetOSErrorString( int a_ErrNo) // According to https://linux.die.net/man/3/strerror_r there are two versions of strerror_r(): - #if defined(__GLIBC__) && defined( _GNU_SOURCE) && !defined(ANDROID) // GNU version of strerror_r() + #if defined(__GLIBC__) && defined( _GNU_SOURCE) // GNU version of strerror_r() char * res = strerror_r( errno, buffer, ARRAYCOUNT(buffer)); if (res != nullptr) -- cgit v1.2.3