3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 14:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Port the minidump library to Android and ARM

Browse Source 
BUG=crashpad:30

Change-Id: I74212722b73f498c263f65d7599a8aca601c7ba0
Reviewed-on: https://chromium-review.googlesource.com/406387
Reviewed-by: Robert Sesek <rsesek@chromium.org>
This commit is contained in:
Mark Mentovai 2016-11-01 15:59:40 -04:00
parent e616638c9d
commit 47a830465f
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
minidump/minidump_misc_info_writer.cc
View File

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