From c439a426499df7fa4e829087228bc3e313dd1e81 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Tue, 4 Sep 2012 09:14:45 +0000 Subject: Fix Android build of gtest and lib/Support. llvm-svn: 163131 --- llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'llvm/utils') 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__ -- cgit v1.2.3