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

Merge master c55e49c13d5c into doc

Browse Source
This commit is contained in:
Mark Mentovai 2016-11-02 11:33:22 -04:00
commit 3f2fc0cb2e
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/client.gyp
View File

@ -61,6 +61,11 @@
], ],
}, },
}], }],
['OS!="mac"', {
'sources!': [
'capture_context_mac.S',
],
}],
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [

5
doc/developing.ad
View File

@ -250,7 +250,8 @@ review is conducted on https://chromium-review.googlesource.com/[Chromium’s
Gerrit] system, and all code reviews must be sent to an appropriate reviewer, Gerrit] system, and all code reviews must be sent to an appropriate reviewer,
with a Cc sent to with a Cc sent to
https://groups.google.com/a/chromium.org/group/crashpad-dev[crashpad-dev]. The https://groups.google.com/a/chromium.org/group/crashpad-dev[crashpad-dev]. The
`codereview.settings` file specifies this environment to `git-cl`. https://chromium.googlesource.com/crashpad/crashpad/+/master/codereview.settings[`codereview.settings`]
file specifies this environment to `git-cl`.
`git-cl` is part of the `git-cl` is part of the
https://dev.chromium.org/developers/how-tos/depottools[depot_tools]. There’s no https://dev.chromium.org/developers/how-tos/depottools[depot_tools]. There’s no
@ -285,7 +286,7 @@ feedback.
=== Landing Changes === Landing Changes
After code review is complete and “Code-Review: +1”) has been received from all After code review is complete and “Code-Review: +1” has been received from all
reviewers, project members can commit the patch themselves: reviewers, project members can commit the patch themselves:
[subs="verbatim,quotes"] [subs="verbatim,quotes"]

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_ARMEL)
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;

4
util/util.gyp
View File

@ -284,6 +284,10 @@
}, },
}], }],
], ],
}, { # else: OS!="win"
'sources!': [
'win/capture_context.asm',
],
}], }],
], ],
}, },