OS(ANDROID) should not imply OS(LINUX)

Source/wtf/Assertions.cpp

 /*
  * Copyright (C) 2003, 2006, 2007 Apple Inc.  All rights reserved.
  * Copyright (C) 2007-2009 Torch Mobile, Inc.
  * Copyright (C) 2011 University of Szeged. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 45 matching lines @@
 
 #if COMPILER(MSVC)
 #include <crtdbg.h>
 #endif
 
 #if OS(WIN)
 #include <windows.h>
 #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>
 #endif
 
 #if OS(ANDROID)
 #include "android/log.h"
 #endif
 
 extern "C" {
@@ skipping 142 matching lines @@
 }
 
 void WTFReportArgumentAssertionFailure(const char* file, int line, const char* function, const char* argName, const char* assertion)
 {
     printf_stderr_common("ARGUMENT BAD: %s, %s\n", argName, assertion);
     printCallSite(file, line, function);
 }
 
 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
     // in the Windows Server 2003 R2 Platform SDK. So, we'll grab the function
     // through GetProcAddress.
     typedef WORD (NTAPI* RtlCaptureStackBackTraceFunc)(DWORD, DWORD, PVOID*, PDWORD);
     HMODULE kernel32 = ::GetModuleHandleW(L"Kernel32.dll");
     if (!kernel32) {
         *size = 0;
         return;
@@ skipping 18 matching lines @@
 
     WTFGetBacktrace(samples, &frames);
     WTFPrintBacktrace(samples + framesToSkip, frames - framesToSkip);
 }
 
 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;
         if (mangledName)
             cxaDemangled = abi::__cxa_demangle(mangledName, 0, 0, 0);
 #endif
         const int frameNumber = i + 1;
         if (mangledName || cxaDemangled)
             printf_stderr_common("%-3d %p %s\n", frameNumber, stack[i], cxaDemangled ? cxaDemangled : mangledName);
         else
@@ skipping 97 matching lines @@
 
 void WTFLogAlways(const char* format, ...)
 {
     va_list args;
     va_start(args, format);
     vprintf_stderr_with_trailing_newline(format, args);
     va_end(args);
 }
 
 } // extern "C"