From 47a830465f78a8767946fbb5a2ddd07fe8250b30 Mon Sep 17 00:00:00 2001
From: Mark Mentovai <mark@chromium.org>
Date: Tue, 1 Nov 2016 15:59:40 -0400
Subject: [PATCH] Port the minidump library to Android and ARM

BUG=crashpad:30

Change-Id: I74212722b73f498c263f65d7599a8aca601c7ba0
Reviewed-on: https://chromium-review.googlesource.com/406387
Reviewed-by: Robert Sesek <rsesek@chromium.org>
---
 minidump/minidump_misc_info_writer.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/minidump/minidump_misc_info_writer.cc b/minidump/minidump_misc_info_writer.cc
index 1d25b115..3f7dc00c 100644
--- a/minidump/minidump_misc_info_writer.cc
+++ b/minidump/minidump_misc_info_writer.cc
@@ -31,6 +31,8 @@
 
 #if defined(OS_MACOSX)
 #include <AvailabilityMacros.h>
+#elif defined(OS_ANDROID)
+#include <android/api-level.h>
 #endif
 
 namespace crashpad {
@@ -99,6 +101,8 @@ std::string MinidumpMiscInfoDebugBuildString() {
   // they will be truncated and a message will be logged.
 #if defined(OS_MACOSX)
   const char kOS[] = "mac";
+#elif defined(OS_ANDROID)
+  const char kOS[] = "android";
 #elif defined(OS_LINUX)
   const char kOS[] = "linux";
 #elif defined(OS_WIN)
@@ -111,6 +115,10 @@ std::string MinidumpMiscInfoDebugBuildString() {
   const char kCPU[] = "i386";
 #elif defined(ARCH_CPU_X86_64)
   const char kCPU[] = "amd64";
+#elif defined(ARCH_CPU_ARM)
+  const char kCPU[] = "arm";
+#elif defined(ARCH_CPU_ARM64)
+  const char kCPU[] = "arm64";
 #else
 #error define kCPU for this CPU
 #endif
@@ -126,6 +134,8 @@ std::string MinidumpMiscInfoDebugBuildString() {
       ",%d,%d",
       AvailabilityVersionToMacOSXMinorVersion(MAC_OS_X_VERSION_MIN_REQUIRED),
       AvailabilityVersionToMacOSXMinorVersion(MAC_OS_X_VERSION_MAX_ALLOWED));
+#elif defined(OS_ANDROID)
+  debug_build_string += base::StringPrintf(",%d", __ANDROID_API__);
 #endif
 
   return debug_build_string;