Replace ANDROID with __ANDROID__ (#4909)

__ANDROID__ is always set by the toolchain and less likely to cause
conflicts than ANDROID. This change also removes the -DANDROID flag
we set ourselves in our toolchain CMake files since we don't need
it anymore.
This commit is contained in:
Romain Guy
2021-11-30 16:27:56 -08:00
committed by GitHub
parent ffbfc13530
commit dd4853bcc5
24 changed files with 41 additions and 37 deletions

View File

@@ -23,7 +23,7 @@
#include <memory>
// FIXME: Some platforms do not have execinfo.h (but have unwind.h)
#if !defined(ANDROID) && !defined(WIN32) && !defined(__EMSCRIPTEN__)
#if !defined(__ANDROID__) && !defined(WIN32) && !defined(__EMSCRIPTEN__)
#include <execinfo.h>
#define HAS_EXECINFO 1
#else