Merge "Bionic does not provide a cxxabi"

peteralfonso · Jan 21, 2010 · f97111f · f97111f
2 parents 3f9bef5 + 10f1732
commit f97111f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/include/gtest/internal/gtest-type-util.h b/include/gtest/internal/gtest-type-util.h
@@ -47,7 +47,7 @@
 
 #if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && !GTEST_OS_ANDROID
 #include <cxxabi.h>
 #endif  // __GNUC__