Merge pull request #918 from DanAlbert/fix-android-GTEST_HAS_CLONE

Fix detection of GTEST_HAS_CLONE for Android.

Merge pull request #918 from DanAlbert/fix-android-GTEST_HAS_CLONE
Fix detection of GTEST_HAS_CLONE for Android.
a2b8a8e0 · Billy Donahue · GitHub · 3447fc31 · 4eafafbd · a2b8a8e0
Commit a2b8a8e0 authored Nov 03, 2016 by Billy Donahue Committed by GitHub Nov 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

googletest/include/gtest/internal/gtest-port.h googletest/include/gtest/internal/gtest-port.h +6 -2

No files found.
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -760,8 +760,12 @@ using ::std::tuple_size;

 # if GTEST_OS_LINUX && !defined(__ia64__)
 #  if GTEST_OS_LINUX_ANDROID
-// On Android, clone() is only available on ARM starting with Gingerbread.
-#    if defined(__arm__) && __ANDROID_API__ >= 9
+// On Android, clone() became available at different API levels for each 32-bit
+// architecture.
+#    if defined(__LP64__) || \
+        (defined(__arm__) && __ANDROID_API__ >= 9) || \
+        (defined(__mips__) && __ANDROID_API__ >= 12) || \
+        (defined(__i386__) && __ANDROID_API__ >= 17)
 #     define GTEST_HAS_CLONE 1
 #    else
 #     define GTEST_HAS_CLONE 0