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

@@ -19,14 +19,14 @@
#include <utils/api_level.h>
#ifdef ANDROID
#ifdef __ANDROID__
#include <mutex>
#include <sys/system_properties.h>
#endif
namespace utils {
#ifdef ANDROID
#ifdef __ANDROID__
uint32_t sApiLevel = 0;
std::once_flag sApiLevelOnceFlag;