| Index: base/process/memory_linux.cc
|
| diff --git a/base/process/memory_linux.cc b/base/process/memory_linux.cc
|
| index 9fb630b4750bff97a952850c655b8159fe9c075d..985bc54eb64439c68878671134d014e26c1a8cfd 100644
|
| --- a/base/process/memory_linux.cc
|
| +++ b/base/process/memory_linux.cc
|
| @@ -27,7 +27,6 @@ size_t g_oom_size = 0U;
|
|
|
| namespace {
|
|
|
| -#if !defined(OS_ANDROID)
|
| void OnNoMemorySize(size_t size) {
|
| g_oom_size = size;
|
|
|
| @@ -39,7 +38,6 @@ void OnNoMemorySize(size_t size) {
|
| void OnNoMemory() {
|
| OnNoMemorySize(0);
|
| }
|
| -#endif // !defined(OS_ANDROID)
|
|
|
| } // namespace
|
|
|
| @@ -147,15 +145,10 @@ void EnableTerminationOnHeapCorruption() {
|
| }
|
|
|
| void EnableTerminationOnOutOfMemory() {
|
| -#if defined(OS_ANDROID)
|
| - // Android doesn't support setting a new handler.
|
| - DLOG(WARNING) << "Not feasible.";
|
| -#else
|
| // Set the new-out of memory handler.
|
| std::set_new_handler(&OnNoMemory);
|
| // If we're using glibc's allocator, the above functions will override
|
| // malloc and friends and make them die on out of memory.
|
| -#endif
|
|
|
| #if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
|
| allocator::SetCallNewHandlerOnMallocFailure(true);
|
|
|