From f43ab9ce5b48ed622736d96c9fba9e8fa57858a3 Mon Sep 17 00:00:00 2001 From: jam Date: Fri, 6 Feb 2015 19:27:04 -0800 Subject: Revert of Enable libc++ on Android (patchset #16 id:460001 of https://codereview.chromium.org/835633003/) Reason for revert: Slows down the slowest bot on CQ by 20 minutes. BUG=456396 Original issue's description: > Enable libc++ on Android > > Switch Chrome on Android to use libc++ instead of stlport. WebView AOSP > builds will continue to use stlport for the time being. > > Note that this change is exploratory, and likely to be reverted before > branch point (ensuring WebView and Chrome remain in lockstep with > respect to standard library dependencies). > > BUG=427718 > TBR=cpu@chromium.org > > Committed: https://crrev.com/8681920fa22ded465054301ce96657a4ddaf2a04 > Cr-Commit-Position: refs/heads/master@{#315085} TBR=fdegans@chromium.org,pasko@chromium.org,jamesr@chromium.org,thakis@chromium.org,boliu@chromium.org,davidben@chromium.org,cpu@chromium.org,piman@chromium.org,jdduke@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=427718 Review URL: https://codereview.chromium.org/903323002 Cr-Commit-Position: refs/heads/master@{#315174} --- base/containers/hash_tables.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'base/containers') diff --git a/base/containers/hash_tables.h b/base/containers/hash_tables.h index 736e892..6bf029e 100644 --- a/base/containers/hash_tables.h +++ b/base/containers/hash_tables.h @@ -45,7 +45,7 @@ #undef __DEPRECATED #endif -#if defined(OS_ANDROID) && defined(USE_STLPORT) +#if defined(OS_ANDROID) #include #include #define BASE_HASH_IMPL_NAMESPACE std @@ -84,7 +84,7 @@ struct hash { } }; -#if !defined(USE_STLPORT) +#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 +102,7 @@ DEFINE_TRIVIAL_HASH(long long); DEFINE_TRIVIAL_HASH(unsigned long long); #undef DEFINE_TRIVIAL_HASH -#endif // !defined(USE_STLPORT) +#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 -- cgit v1.1