Index: third_party/re2/patches/re2-libcxx.patch |
diff --git a/third_party/re2/patches/re2-libcxx.patch b/third_party/re2/patches/re2-libcxx.patch |
index fc4dd1c90ab2ae6fb32d77d59f1a342abc9dfec3..54f3b6bd62df02b53c5d22939f31c0f799e6dd46 100644 |
--- a/third_party/re2/patches/re2-libcxx.patch |
+++ b/third_party/re2/patches/re2-libcxx.patch |
@@ -12,3 +12,12 @@ index 8f54040..de1ef5b 100644 |
#include <tr1/unordered_set> |
using std::tr1::unordered_set; |
+@@ -54,1 +55,1 @@ using std::tr1::unordered_set; |
+ #else |
+ |
+ #include <unordered_set> |
+-#if defined(WIN32) || defined(OS_ANDROID) |
++#if defined(WIN32) || (defined(OS_ANDROID) && !defined(_LIBCPP_ABI_VERSION)) |
+ using std::tr1::unordered_set; |
+ #else |
+ using std::unordered_set; |