3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2024-12-26 23:01:05 +08:00
Code Issues Projects Releases Wiki Activity

Makes 'all' build on Linux

Browse Source 
I can never remember which targets are buildable; this makes just

  ninja -C out/lin

work, without too much fuss. I think this means we could turn on trybots
too, as I think all the tests that are built also run.

Bug: crashpad:30
Change-Id: I4759bb799dabf977c5b072691f28d00bf92bbebc
Reviewed-on: https://chromium-review.googlesource.com/924564
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
Commit-Queue: Scott Graham <scottmg@chromium.org>
This commit is contained in:
Scott Graham 2018-02-19 11:11:38 -08:00 committed by Commit Bot
parent 8b738cd24d
commit d2a866978b
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
handler/BUILD.gn
View File

@ -18,6 +18,8 @@ static_library("handler") {
sources = [
"crash_report_upload_thread.cc",
"crash_report_upload_thread.h",
"handler_main.cc",
"handler_main.h",
"minidump_to_upload_parameters.cc",
"minidump_to_upload_parameters.h",
"prune_crash_reports_thread.cc",
@ -44,11 +46,6 @@ static_library("handler") {
"linux/exception_handler_server.cc",
"linux/exception_handler_server.h",
]
} else {
sources += [
"handler_main.cc",
"handler_main.h",
]
}
if (crashpad_is_win) {

2
handler/handler.gyp
View File

@ -59,7 +59,7 @@
'win/crash_report_exception_handler.h',
],
'conditions': [
['OS=="linux" or OS=="android"', {
['OS=="android"', {
'sources!': [
'handler_main.cc',
],

15
handler/handler_main.cc
View File

@ -77,6 +77,9 @@
#elif defined(OS_FUCHSIA)
#include "handler/fuchsia/crash_report_exception_handler.h"
#include "handler/fuchsia/exception_handler_server.h"
#elif defined(OS_LINUX)
#include "handler/linux/crash_report_exception_handler.h"
#include "handler/linux/exception_handler_server.h"
#endif // OS_MACOSX
namespace crashpad {
@ -348,14 +351,18 @@ void InstallCrashHandler() {
ALLOW_UNUSED_LOCAL(terminate_handler);
}
#elif defined(OS_FUCHSIA)
#elif defined(OS_FUCHSIA) || defined(OS_LINUX)
void InstallCrashHandler() {
NOTREACHED(); // TODO(scottmg): https://crashpad.chromium.org/bug/196
// TODO(scottmg): Fuchsia: https://crashpad.chromium.org/bug/196
// TODO(jperaza): Linux: https://crashpad.chromium.org/bug/30
NOTREACHED();
}
void ReinstallCrashHandler() {
NOTREACHED(); // TODO(scottmg): https://crashpad.chromium.org/bug/196
// TODO(scottmg): Fuchsia: https://crashpad.chromium.org/bug/196
// TODO(jperaza): Linux: https://crashpad.chromium.org/bug/30
NOTREACHED();
}
#endif // OS_MACOSX
@ -740,7 +747,7 @@ int HandlerMain(int argc,
if (!options.pipe_name.empty()) {
exception_handler_server.SetPipeName(base::UTF8ToUTF16(options.pipe_name));
}
#elif defined(OS_FUCHSIA)
#elif defined(OS_FUCHSIA) || defined(OS_LINUX)
ExceptionHandlerServer exception_handler_server;
#endif // OS_MACOSX

8
tools/generate_dump.cc
View File

@ -47,6 +47,8 @@
#include "util/win/xp_compat.h"
#elif defined(OS_FUCHSIA)
#include "snapshot/fuchsia/process_snapshot_fuchsia.h"
#elif defined(OS_LINUX)
#include "snapshot/linux/process_snapshot_linux.h"
#endif // OS_MACOSX
namespace crashpad {
@ -199,6 +201,12 @@ int GenerateDumpMain(int argc, char* argv[]) {
if (!process_snapshot.Initialize(ZX_HANDLE_INVALID)) {
return EXIT_FAILURE;
}
#elif defined(OS_LINUX)
// TODO(jperaza): https://crashpad.chromium.org/bug/30.
ProcessSnapshotLinux process_snapshot;
if (!process_snapshot.Initialize(nullptr)) {
return EXIT_FAILURE;
}
#endif // OS_MACOSX
FileWriter file_writer;