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:
@@ -19,7 +19,7 @@
|
||||
#include <string>
|
||||
#include <utils/compiler.h>
|
||||
|
||||
#ifdef ANDROID
|
||||
#ifdef __ANDROID__
|
||||
# include <android/log.h>
|
||||
# ifndef UTILS_LOG_TAG
|
||||
# define UTILS_LOG_TAG "Filament"
|
||||
|
||||
Reference in New Issue
Block a user