Bug 1276927: Fix B2G sandboxing code to build with Android NDK, r=fabrice
authorThomas Zimmermann <tdz@users.sourceforge.net>
Thu, 16 Jun 2016 08:43:51 +0100
changeset 301948 aeb69f71885ceb792487ca12d9e19795f5057c7e
parent 301947 d5702f8571cbeb1c3f320312de7f6faf9dbc73a6
child 301949 aa274c30c0169f7a37e51c82a81e09ccb06e5d62
push id78511
push usertdz@users.sourceforge.net
push dateThu, 16 Jun 2016 07:44:15 +0000
treeherdermozilla-inbound@c00929700590 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfabrice
bugs1276927
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
security/sandbox/chromium/base/containers/hash_tables.h
--- 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