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

ndk-7b.

Patch by Carlos Valdivia <carlosvaldivia@google.com>

Review URL: https://breakpad.appspot.com/363001/


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@945 4c0a9323-5329-0410-9bdc-e9ce6186880e

src/common/linux/file_id.cc

@@ -36,10 +36,11 @@
 
 #include <arpa/inet.h>
 #include <assert.h>
-#include <elf.h>
 #if defined(__ANDROID__)
+#include <linux/elf.h>
 #include "client/linux/android_link.h"
 #else
+#include <elf.h>
 #include <link.h>
 #endif
 #include <string.h>

src/common/linux/memory_mapped_file.cc

@@ -34,6 +34,9 @@
 
 #include <fcntl.h>
 #include <sys/mman.h>
+#if defined(__ANDROID__)
+#include <sys/stat.h>
+#endif
 #include <unistd.h>
 
 #include "common/memory_range.h"
@@ -59,7 +62,10 @@ bool MemoryMappedFile::Map(const char* path) {
     return false;
   }
 
-#if defined(__x86_64__)
+#if defined(__ANDROID__)
+  struct stat st;
+  if (fstat(fd, &st) != 0) {
+#elif defined(__x86_64__)
   struct kernel_stat st;
   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
 #else