diff options
| author | Selim Gurun <sgurun@google.com> | 2012-06-05 18:18:30 -0700 |
|---|---|---|
| committer | Selim Gurun <sgurun@google.com> | 2012-06-06 10:10:55 -0700 |
| commit | 86e0fcf830dcbada802ea2de22904e912dda5384 (patch) | |
| tree | 70cbd98be2fe6481feecf9cee18db8845aa9f32b /net | |
| parent | 4f8351323b84a7b8c3275e6df8a99a4738fabf45 (diff) | |
| download | external_chromium-86e0fcf830dcbada802ea2de22904e912dda5384.zip external_chromium-86e0fcf830dcbada802ea2de22904e912dda5384.tar.gz external_chromium-86e0fcf830dcbada802ea2de22904e912dda5384.tar.bz2 | |
DO NOT MERGE Convert exit calls to abort for Android
Bug: 6603427
Cherry picking from master to jb-dev. Sha:
edec5f424996d4a532ba6fdb2203c06a02887606
This is to track some silent failures happening in mediaserver.
Change-Id: I9345cee5e0137b723fd5a2b7c787c235af4462b8
Diffstat (limited to 'net')
| -rw-r--r-- | net/disk_cache/rankings.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/disk_cache/rankings.cc b/net/disk_cache/rankings.cc index 902db1c..11c91d3 100644 --- a/net/disk_cache/rankings.cc +++ b/net/disk_cache/rankings.cc @@ -71,10 +71,14 @@ void TerminateSelf() { // Windows does more work on _exit() than we would like, so we force exit. TerminateProcess(GetCurrentProcess(), 0); #elif defined(OS_POSIX) +#if defined(ANDROID) + abort(); +#else // On POSIX, _exit() will terminate the process with minimal cleanup, // and it is cleaner than killing. _exit(0); #endif +#endif } #endif // NDEBUG |