| Index: test/unittests/base/platform/platform-unittest.cc
|
| diff --git a/test/unittests/base/platform/platform-unittest.cc b/test/unittests/base/platform/platform-unittest.cc
|
| index 06fbee004227b84ecfbe717bf45bea7f4c66e6be..b972d8ab3e65123d451511c249fcb7c48d637ba4 100644
|
| --- a/test/unittests/base/platform/platform-unittest.cc
|
| +++ b/test/unittests/base/platform/platform-unittest.cc
|
| @@ -94,7 +94,13 @@ class ThreadLocalStorageTest : public Thread, public ::testing::Test {
|
| return reinterpret_cast<void*>(static_cast<uintptr_t>(x + 1));
|
| }
|
|
|
| +#if defined(ANDROID)
|
| + // Older versions of Android have fewer TLS slots (nominally 64, but the
|
| + // system uses "about 5 of them" itself).
|
| + Thread::LocalStorageKey keys_[32];
|
| +#else
|
| Thread::LocalStorageKey keys_[256];
|
| +#endif
|
| };
|
|
|
| } // namespace
|
|
|