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:
@@ -39,7 +39,7 @@
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef ANDROID
|
||||
#ifdef __ANDROID__
|
||||
# include <sys/ioctl.h>
|
||||
# include <sys/stat.h>
|
||||
# include <memory.h>
|
||||
@@ -51,7 +51,7 @@
|
||||
|
||||
namespace utils {
|
||||
|
||||
#ifdef ANDROID
|
||||
#ifdef __ANDROID__
|
||||
|
||||
#if __ANDROID_API__ >= 26
|
||||
|
||||
|
||||
Reference in New Issue
Block a user