Changes to get the breakpad client compiling and running on Android using

src/client/linux/minidump_writer/minidump_writer.cc

Index: src/client/linux/minidump_writer/minidump_writer.cc
===================================================================
--- src/client/linux/minidump_writer/minidump_writer.cc	(revision 929)
+++ src/client/linux/minidump_writer/minidump_writer.cc	(working copy)
@@ -46,27 +46,21 @@
 #include "client/linux/minidump_writer/minidump_writer.h"
 #include "client/minidump_file_writer-inl.h"
 
+#include <algorithm>

[Mark Mentovai, 2012/04/03 16:40:33]

C system headers come before C++ system headers. This was correct where it was
placed before.

+#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #if !defined(__ANDROID__)
 #include <link.h>
 #endif
 #include <stdio.h>
-#include <unistd.h>
-#include <ctype.h>
 #if !defined(__ANDROID__)
 #include <sys/ucontext.h>
 #include <sys/user.h>
 #endif
 #include <sys/utsname.h>
+#include <unistd.h>
 
-#include <algorithm>
-
-#include "client/minidump_file_writer.h"
-#include "google_breakpad/common/minidump_format.h"
-#include "google_breakpad/common/minidump_cpu_amd64.h"
-#include "google_breakpad/common/minidump_cpu_x86.h"
-
 #if defined(__ANDROID__)
 #include "client/linux/android_link.h"
 #include "client/linux/android_ucontext.h"
@@ -74,10 +68,13 @@
 #include "client/linux/handler/exception_handler.h"
 #include "client/linux/minidump_writer/line_reader.h"
 #include "client/linux/minidump_writer/linux_dumper.h"
-#include "client/linux/minidump_writer/linux_core_dumper.h"
 #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
 #include "client/linux/minidump_writer/minidump_extension_linux.h"
+#include "client/minidump_file_writer.h"
 #include "common/linux/linux_libc_support.h"
+#include "google_breakpad/common/minidump_format.h"
+#include "google_breakpad/common/minidump_cpu_amd64.h"

[Mark Mentovai, 2012/04/03 16:40:33]

These are gone now following r944, checked in earlier today.

+#include "google_breakpad/common/minidump_cpu_x86.h"
 #include "third_party/lss/linux_syscall_support.h"
 
 // Minidump defines register structures which are different from the raw
@@ -1338,12 +1335,10 @@
   return writer.Dump();
 }
 
-bool WriteMinidumpFromCore(const char* filename,
-                           const char* core_path,
-                           const char* procfs_override) {
-  MappingList mappings;
-  LinuxCoreDumper dumper(0, core_path, procfs_override);
-  MinidumpWriter writer(filename, NULL, mappings, &dumper);
+bool WriteMinidump(const char* filename,
+                   const MappingList& mappings,
+                   LinuxDumper* dumper) {
+  MinidumpWriter writer(filename, NULL, mappings, dumper);
   if (!writer.Init())
     return false;
   return writer.Dump();