diff options
| author | jam <jam@chromium.org> | 2015-02-06 19:27:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-07 03:27:49 +0000 |
| commit | f43ab9ce5b48ed622736d96c9fba9e8fa57858a3 (patch) | |
| tree | e94f9bff211cfb6f7796769740ebb226637d5478 /base/containers | |
| parent | b60049a86e45b0160f378624c5dfd99d667c5262 (diff) | |
| download | chromium_src-f43ab9ce5b48ed622736d96c9fba9e8fa57858a3.zip chromium_src-f43ab9ce5b48ed622736d96c9fba9e8fa57858a3.tar.gz chromium_src-f43ab9ce5b48ed622736d96c9fba9e8fa57858a3.tar.bz2 | |
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}
Diffstat (limited to 'base/containers')
| -rw-r--r-- | base/containers/hash_tables.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 <hash_map> #include <hash_set> #define BASE_HASH_IMPL_NAMESPACE std @@ -84,7 +84,7 @@ struct hash<T*> { } }; -#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 |