Bug 1276927: Fix B2G sandboxing code to build with Android NDK, r=fabrice
This patch fixes an incorrect C++ namespace of STL datastructures.
MozReview-Commit-ID: FYx38sTzF4I
--- a/security/sandbox/chromium/base/containers/hash_tables.h
+++ b/security/sandbox/chromium/base/containers/hash_tables.h
@@ -40,17 +40,17 @@
// This is a hack to disable the gcc 4.4 warning about hash_map and hash_set
// being deprecated. We can get rid of this when we upgrade to VS2008 and we
// can use <tr1/unordered_map> and <tr1/unordered_set>.
#ifdef __DEPRECATED
#define CHROME_OLD__DEPRECATED __DEPRECATED
#undef __DEPRECATED
#endif
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(MOZ_WIDGET_GONK)
#include <hash_map>
#include <hash_set>
#define BASE_HASH_IMPL_NAMESPACE std
#else
#include <ext/hash_map>
#include <ext/hash_set>
#define BASE_HASH_IMPL_NAMESPACE __gnu_cxx
#endif