re2-android.patch revision 5821806d5e7f356e8fa4b058a389a808ea183019 
1diff --git a/third_party/re2/re2/parse.cc b/third_party/re2/re2/parse.cc
2index 0cf4ab4..6423fe9 100644
3--- a/third_party/re2/re2/parse.cc
4+++ b/third_party/re2/re2/parse.cc
5@@ -16,6 +16,8 @@
6 // and recognizes the Perl escape sequences \d, \s, \w, \D, \S, and \W.
7 // See regexp.h for rationale.
8 
9+#include <ctype.h>
10+
11 #include "util/util.h"
12 #include "re2/regexp.h"
13 #include "re2/stringpiece.h"
14diff --git a/third_party/re2/re2/re2.cc b/third_party/re2/re2/re2.cc
15index 989add6..78978f1 100644
16--- a/third_party/re2/re2/re2.cc
17+++ b/third_party/re2/re2/re2.cc
18@@ -9,6 +9,8 @@
19 
20 #include "re2/re2.h"
21 
22+#include <ctype.h>
23+
24 #include <stdio.h>
25 #include <string>
26 #ifdef WIN32
27diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h
28index dab7e16..11b5f4a 100644
29--- a/third_party/re2/util/util.h
30+++ b/third_party/re2/util/util.h
31@@ -28,6 +28,7 @@
32 #include <utility>
33 #include <set>
34 
35+#include "build/build_config.h"
36 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
37 
38 // Use std names.
39@@ -44,7 +45,7 @@ using std::sort;
40 using std::swap;
41 using std::make_pair;
42 
43-#if defined(__GNUC__) && !defined(USE_CXX0X)
44+#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID)
45 
46 #include <tr1/unordered_set>
47 using std::tr1::unordered_set;
48@@ -52,7 +53,7 @@ using std::tr1::unordered_set;
49 #else
50 
51 #include <unordered_set>
52-#ifdef WIN32
53+#if defined(WIN32) || defined(OS_ANDROID)
54 using std::tr1::unordered_set;
55 #else
56 using std::unordered_set;
57