| Index: Source/wtf/Assertions.cpp
|
| diff --git a/Source/wtf/Assertions.cpp b/Source/wtf/Assertions.cpp
|
| index 984b44db2e1e3a870447b3f78985e971ce71e8bd..10879d67092210c8ce82716506ce54b7a0eb5f98 100644
|
| --- a/Source/wtf/Assertions.cpp
|
| +++ b/Source/wtf/Assertions.cpp
|
| @@ -63,7 +63,7 @@
|
| #define HAVE_ISDEBUGGERPRESENT 1
|
| #endif
|
|
|
| -#if (OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
|
| +#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
|
| #include <cxxabi.h>
|
| #include <dlfcn.h>
|
| #include <execinfo.h>
|
| @@ -226,7 +226,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f
|
|
|
| void WTFGetBacktrace(void** stack, int* size)
|
| {
|
| -#if (OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
|
| +#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
|
| *size = backtrace(stack, *size);
|
| #elif OS(WIN)
|
| // The CaptureStackBackTrace function is available in XP, but it is not defined
|
| @@ -265,7 +265,7 @@ void WTFPrintBacktrace(void** stack, int size)
|
| for (int i = 0; i < size; ++i) {
|
| const char* mangledName = 0;
|
| char* cxaDemangled = 0;
|
| -#if OS(MACOSX) || (OS(LINUX) && !OS(ANDROID))
|
| +#if OS(MACOSX) || OS(LINUX)
|
| Dl_info info;
|
| if (dladdr(stack[i], &info) && info.dli_sname)
|
| mangledName = info.dli_sname;
|
|
|