diff options
| author |  Benoit Jacob <benoitjacob@google.com> | 2015-03-31 11:17:21 -0400 |
|---|---|---|
| committer | Benoit Jacob <benoitjacob@google.com> | 2015-03-31 11:17:21 -0400 |
| commit | 0cbd5ae3cb0f7b73c945e1d69f3374d902a9f78d (patch) | |
| tree | 313f22c0a8d29516f3af57688c5add4237b9de38 | |
| parent | ae01c05e184c62601521e785f733daf4a425b1c0 (diff) | |
Correctly detect Android with ndk_build
| -rw-r--r-- | Eigen/src/Core/util/Macros.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h index 6b294e77f..7cedb4c97 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -213,7 +213,8 @@ #endif /// \internal EIGEN_OS_ANDROID set to 1 if the OS is Android -#if defined(__ANDROID__) +// note: ANDROID is defined when using ndk_build, __ANDROID__ is defined when using a standalone toolchain. +#if defined(__ANDROID__) || defined(ANDROID) #define EIGEN_OS_ANDROID 1 #else #define EIGEN_OS_ANDROID 0 |