diff options
| author | jdduke <jdduke@chromium.org> | 2015-05-05 00:34:05 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-05 07:34:51 +0000 |
| commit | 9f355f21c4049c622c71fc66a50e0288c5211335 (patch) | |
| tree | b6d24d34e4c2a71d5502c110d17899964cfcd3a3 /base/containers | |
| parent | 3e8bda613486ae81f53428ab9f41a7dbb7f9f0c3 (diff) | |
| download | chromium_src-9f355f21c4049c622c71fc66a50e0288c5211335.zip chromium_src-9f355f21c4049c622c71fc66a50e0288c5211335.tar.gz chromium_src-9f355f21c4049c622c71fc66a50e0288c5211335.tar.bz2 | |
Reland "Enable libc++ on Android"
Switch all Android builds to use libc++ instead of stlport.
This change originally landed in crrev.com/315085, but was reverted in
crrev.com/315174 due to CQ execution time regressions.
The root cause of the test time regression was determined to be an issue
with MD5 hash computation, where hashing failed to produce a consistent
result in turn preventing deployment optimizations. This was resolved in
crbug.com/456396, leaving libc++ test runs comparable with stlport runs.
BUG=456396,427718
Review URL: https://codereview.chromium.org/951983002
Cr-Commit-Position: refs/heads/master@{#328296}
Diffstat (limited to 'base/containers')
| -rw-r--r-- | base/containers/hash_tables.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/base/containers/hash_tables.h b/base/containers/hash_tables.h index d13c469..5ce9161 100644 --- a/base/containers/hash_tables.h +++ b/base/containers/hash_tables.h @@ -45,15 +45,9 @@ #undef __DEPRECATED #endif -#if defined(OS_ANDROID) -#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 #include <string> @@ -84,7 +78,6 @@ struct hash<T*> { } }; -#if !defined(OS_ANDROID) // The GNU C++ library provides identity hash functions for many integral types, // but not for |long long|. This hash function will truncate if |size_t| is // narrower than |long long|. This is probably good enough for what we will @@ -102,7 +95,6 @@ DEFINE_TRIVIAL_HASH(long long); DEFINE_TRIVIAL_HASH(unsigned long long); #undef DEFINE_TRIVIAL_HASH -#endif // !defined(OS_ANDROID) // Implement string hash functions so that strings of various flavors can // be used as keys in STL maps and sets. The hash algorithm comes from the |