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

@@ -39,7 +39,7 @@ static constexpr bool DEBUG_FINISH_HANGS = false;
# include <pthread.h>
#endif
#ifdef ANDROID
#ifdef __ANDROID__
# include <sys/time.h>
# include <sys/resource.h>
# ifndef ANDROID_PRIORITY_URGENT_DISPLAY
@@ -81,7 +81,7 @@ void JobSystem::setThreadName(const char* name) noexcept {
}
void JobSystem::setThreadPriority(Priority priority) noexcept {
#ifdef ANDROID
#ifdef __ANDROID__
int androidPriority = 0;
switch (priority) {
case Priority::NORMAL: