summaryrefslogtreecommitdiffstats
path: root/llvm/utils/unittest/googletest/include/gtest
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
commitc439a426499df7fa4e829087228bc3e313dd1e81 (patch)
tree1d24eb3c94e1ec0fc43d645f3cb34a85d93dd6cc /llvm/utils/unittest/googletest/include/gtest
parentad41c4ce20ab92e679458c94767542cb965719f6 (diff)
downloadbcm5719-llvm-c439a426499df7fa4e829087228bc3e313dd1e81.tar.gz
bcm5719-llvm-c439a426499df7fa4e829087228bc3e313dd1e81.zip
Fix Android build of gtest and lib/Support.
llvm-svn: 163131
Diffstat (limited to 'llvm/utils/unittest/googletest/include/gtest')
-rw-r--r--llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h
index 8ef5d7dd26a..58f6cafa75f 100644
--- a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h
+++ b/llvm/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__
OpenPOWER on IntegriCloud