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
+1 -1
View File
@@ -95,7 +95,7 @@ FreeList::FreeList(void* begin, void* end,
AtomicFreeList::AtomicFreeList(void* begin, void* end,
size_t elementSize, size_t alignment, size_t extra) noexcept
{
#ifdef ANDROID
#ifdef __ANDROID__
// on some platform (e.g. web) this returns false. we really only care about mobile though.
assert(mHead.is_lock_free());
#endif