12a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)diff --git a/util/util.h b/util/util.h 22a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)index 17ef824..8f54040 100644 32a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)--- a/util/util.h 42a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)+++ b/util/util.h 52a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)@@ -29,6 +29,7 @@ 65821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) #include <utility> 75821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) #include <set> 85821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 95821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)+#include "build/build_config.h" 105821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) #include "base/third_party/dynamic_annotations/dynamic_annotations.h" 115821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 125821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) // Use std names. 132a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)@@ -45,7 +46,7 @@ using std::sort; 145821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) using std::swap; 155821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) using std::make_pair; 165821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 175821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)-#if defined(__GNUC__) && !defined(USE_CXX0X) 185821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)+#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID) 195821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 205821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) #include <tr1/unordered_set> 215821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) using std::tr1::unordered_set; 222a99a7e74a7f215066514fe81d2bfa6639d9edddTorne (Richard Coles)@@ -53,7 +54,7 @@ using std::tr1::unordered_set; 235821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) #else 245821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) 255821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) #include <unordered_set> 265821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)-#ifdef WIN32 275821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles)+#if defined(WIN32) || defined(OS_ANDROID) 285821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) using std::tr1::unordered_set; 295821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) #else 305821806d5e7f356e8fa4b058a389a808ea183019Torne (Richard Coles) using std::unordered_set; 31