summaryrefslogtreecommitdiff
path: root/utils/unittest
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2012-09-04 09:14:45 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2012-09-04 09:14:45 +0000
commit68d92bdcc99e647546f40cfce5cfbeb904be2985 (patch)
treea626ade038a96ddc5decd9b7c8b5b1bf011df8b7 /utils/unittest
parent5eae90d727c64ca5b4b43b110521b38dcd9f0de6 (diff)
downloadllvm-68d92bdcc99e647546f40cfce5cfbeb904be2985.tar.gz
llvm-68d92bdcc99e647546f40cfce5cfbeb904be2985.tar.bz2
llvm-68d92bdcc99e647546f40cfce5cfbeb904be2985.tar.xz
Fix Android build of gtest and lib/Support.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@163131 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/unittest')
-rw-r--r--utils/unittest/googletest/include/gtest/internal/gtest-port.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/utils/unittest/googletest/include/gtest/internal/gtest-port.h
index 8ef5d7dd26..58f6cafa75 100644
--- a/utils/unittest/googletest/include/gtest/internal/gtest-port.h
+++ b/utils/unittest/googletest/include/gtest/internal/gtest-port.h
@@ -230,7 +230,7 @@
# define GTEST_OS_MAC 1
#elif defined __linux__
# define GTEST_OS_LINUX 1
-# ifdef ANDROID
+# if defined(ANDROID) || defined(__ANDROID__)
# define GTEST_OS_LINUX_ANDROID 1
# endif // ANDROID
#elif defined __MVS__