From e053f72db824a16c1cb59107315001473058e2bc Mon Sep 17 00:00:00 2001 From: Mat Date: Sun, 10 May 2020 19:18:28 +0300 Subject: Android build cleanup (#4734) * Android build cleanup * Remove unnecessary workaround * Remove more unnecessities * Bump cmake version --- src/OSSupport/StackTrace.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/OSSupport/StackTrace.cpp') diff --git a/src/OSSupport/StackTrace.cpp b/src/OSSupport/StackTrace.cpp index b8f80f5f3..d252e1e83 100644 --- a/src/OSSupport/StackTrace.cpp +++ b/src/OSSupport/StackTrace.cpp @@ -7,7 +7,7 @@ #include "StackTrace.h" #ifdef _WIN32 #include "WinStackWalker.h" -#elif !defined(ANDROID) // The Android NDK has no execinfo header +#else #ifdef __GLIBC__ #include #endif @@ -30,7 +30,7 @@ void PrintStackTrace(void) } } sw; sw.ShowCallstack(); - #elif !defined(ANDROID) + #else #ifdef __GLIBC__ // Use the backtrace() function to get and output the stackTrace: // Code adapted from https://stackoverflow.com/questions/77005/how-to-generate-a-stacktrace-when-my-gcc-c-app-crashes -- cgit v1.2.3