| Index: nspr/pr/src/io/prlog.c
|
| diff --git a/nspr/pr/src/io/prlog.c b/nspr/pr/src/io/prlog.c
|
| index eec95e8a75d7aa4b9ac9e83bed8e31209b0d2428..dae80282d9a73f9bfaa9b5cf64e5d6b312b6cb00 100644
|
| --- a/nspr/pr/src/io/prlog.c
|
| +++ b/nspr/pr/src/io/prlog.c
|
| @@ -537,6 +537,9 @@ PR_IMPLEMENT(void) PR_LogFlush(void)
|
| PR_IMPLEMENT(void) PR_Abort(void)
|
| {
|
| PR_LogPrint("Aborting");
|
| +#ifdef ANDROID
|
| + __android_log_write(ANDROID_LOG_ERROR, "PRLog", "Aborting");
|
| +#endif
|
| abort();
|
| }
|
|
|
| @@ -547,9 +550,11 @@ PR_IMPLEMENT(void) PR_Assert(const char *s, const char *file, PRIntn ln)
|
| fflush(stderr);
|
| #ifdef WIN32
|
| DebugBreak();
|
| -#endif
|
| -#ifdef XP_OS2
|
| +#elif defined(XP_OS2)
|
| asm("int $3");
|
| +#elif defined(ANDROID)
|
| + __android_log_assert(NULL, "PRLog", "Assertion failure: %s, at %s:%d\n",
|
| + s, file, ln);
|
| #endif
|
| abort();
|
| }
|
|
|