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

gn, linux: Update build after 9b2ba587f618

Browse Source 
Bug: crashpad:30, crashpad:79
Change-Id: Ib50352cfd36d40786b9732e7c4ab50781963369b
Reviewed-on: https://chromium-review.googlesource.com/835028
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
Commit-Queue: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Mark Mentovai 2017-12-19 17:13:13 -05:00 committed by Commit Bot
parent 9b2ba587f6
commit 3a41c51668
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
handler/BUILD.gn
View File

@ -16,8 +16,6 @@ static_library("handler") {
sources = [ sources = [
"crash_report_upload_thread.cc", "crash_report_upload_thread.cc",
"crash_report_upload_thread.h", "crash_report_upload_thread.h",
"handler_main.cc",
"handler_main.h",
"minidump_to_upload_parameters.cc", "minidump_to_upload_parameters.cc",
"minidump_to_upload_parameters.h", "minidump_to_upload_parameters.h",
"prune_crash_reports_thread.cc", "prune_crash_reports_thread.cc",
@ -37,6 +35,18 @@ static_library("handler") {
] ]
} }
if (is_linux) {
sources += [
"linux/exception_handler_server.cc",
"linux/exception_handler_server.h",
]
} else {
sources += [
"handler_main.cc",
"handler_main.h",
]
}
if (is_win) { if (is_win) {
sources += [ sources += [
"win/crash_report_exception_handler.cc", "win/crash_report_exception_handler.cc",
@ -77,6 +87,14 @@ source_set("handler_test") {
"minidump_to_upload_parameters_test.cc", "minidump_to_upload_parameters_test.cc",
] ]
if (is_linux) {
sources += [ "linux/exception_handler_server_test.cc" ]
}
if (is_win) {
sources += [ "crashpad_handler_test.cc" ]
}
deps = [ deps = [
":handler", ":handler",
"../client", "../client",
@ -90,8 +108,6 @@ source_set("handler_test") {
] ]
if (is_win) { if (is_win) {
sources += [ "crashpad_handler_test.cc" ]
data_deps = [ data_deps = [
":crashpad_handler_test_extended_handler", ":crashpad_handler_test_extended_handler",
] ]

7
handler/handler.gyp
View File

@ -62,13 +62,6 @@
'handler_main.cc', 'handler_main.cc',
], ],
}], }],
['OS=="linux"', {
'link_settings': {
'libraries': [
'-lcap',
],
},
}],
], ],
'target_conditions': [ 'target_conditions': [
['OS=="android"', { ['OS=="android"', {

2
test/BUILD.gn
View File

@ -71,6 +71,8 @@ static_library("test") {
"linux/fake_ptrace_connection.h", "linux/fake_ptrace_connection.h",
"linux/get_tls.cc", "linux/get_tls.cc",
"linux/get_tls.h", "linux/get_tls.h",
"linux/scoped_pr_set_ptracer.cc",
"linux/scoped_pr_set_ptracer.h",
] ]
} }

3
util/BUILD.gn
View File

@ -248,6 +248,9 @@ static_library("util") {
"linux/checked_linux_address_range.h", "linux/checked_linux_address_range.h",
"linux/direct_ptrace_connection.cc", "linux/direct_ptrace_connection.cc",
"linux/direct_ptrace_connection.h", "linux/direct_ptrace_connection.h",
"linux/exception_handler_client.cc",
"linux/exception_handler_client.h",
"linux/exception_handler_protocol.h",
"linux/exception_information.h", "linux/exception_information.h",
"linux/memory_map.cc", "linux/memory_map.cc",
"linux/memory_map.h", "linux/memory_map.h",