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

Split util/net files into a separate static_library target.

Browse Source 
Only the handler uses util/net. After
8342e6bd613a5b2e44eca1d74288e3115ccef139, the introduction of an
Objective-C class caused Chromium to emit duplicate class defintion
warnings in the component build.

Bug: chromium:1270609
Change-Id: I2770528347aef406bb21a79d295f702498f7b37e
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3290276
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Robert Sesek 2021-11-19 13:01:52 -05:00 committed by Crashpad LUCI CQ
parent 92f6c21242
commit c8edcf1bb8
3 changed files with 61 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
handler/BUILD.gn
View File

@ -112,6 +112,7 @@ static_library("common") {
"../client:common",
"../snapshot",
"../util",
"../util:net",
]
if (crashpad_is_win) {
cflags = [ "/wd4201" ] # nonstandard extension used : nameless struct/union

1
tools/BUILD.gn
View File

@ -48,6 +48,7 @@ if (!crashpad_is_ios) {
"../compat",
"$mini_chromium_source_parent:base",
"../util",
"../util:net",
]
}
}

95
util/BUILD.gn
View File

@ -217,17 +217,6 @@ crashpad_static_library("util") {
"misc/uuid.h",
"misc/zlib.cc",
"misc/zlib.h",
"net/http_body.cc",
"net/http_body.h",
"net/http_body_gzip.cc",
"net/http_body_gzip.h",
"net/http_headers.h",
"net/http_multipart_builder.cc",
"net/http_multipart_builder.h",
"net/http_transport.cc",
"net/http_transport.h",
"net/url.cc",
"net/url.h",
"numeric/checked_address_range.cc",
"numeric/checked_address_range.h",
"numeric/checked_range.h",
@ -369,7 +358,6 @@ crashpad_static_library("util") {
"mach/scoped_task_suspend.h",
"mach/task_for_pid.cc",
"mach/task_for_pid.h",
"net/http_transport_mac.mm",
"posix/process_info_mac.cc",
"process/process_memory_mac.cc",
"process/process_memory_mac.h",
@ -397,34 +385,11 @@ crashpad_static_library("util") {
"ios/raw_logging.h",
"ios/scoped_vm_read.cc",
"ios/scoped_vm_read.h",
"net/http_transport_mac.mm",
]
}
deps = []
if (crashpad_http_transport_impl == "socket") {
sources += [ "net/http_transport_socket.cc" ]
if (crashpad_use_boringssl_for_http_transport_socket) {
defines += [ "CRASHPAD_USE_BORINGSSL" ]
if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
deps += [ "//third_party/boringssl" ]
} else {
libs = [
"crypto",
"ssl",
]
}
}
} else if (crashpad_http_transport_impl == "libcurl") {
sources += [ "net/http_transport_libcurl.cc" ]
if (crashpad_is_in_fuchsia) {
# Host Linux builds in Fuchsia don't have libcurl in a sysroot.
deps += [ "//third_party/curl:libcurl" ]
}
}
if (crashpad_is_android) {
sources += [
"linux/initial_signal_dispositions.cc",
@ -488,7 +453,6 @@ crashpad_static_library("util") {
"misc/clock_win.cc",
"misc/paths_win.cc",
"misc/time_win.cc",
"net/http_transport_win.cc",
"process/process_memory_win.cc",
"process/process_memory_win.h",
"synchronization/semaphore_win.cc",
@ -652,12 +616,70 @@ crashpad_static_library("util") {
}
}
# net is split into a separate target from util so that client code does
# not have to depend on it.
crashpad_static_library("net") {
sources = [
"net/http_body.cc",
"net/http_body.h",
"net/http_body_gzip.cc",
"net/http_body_gzip.h",
"net/http_headers.h",
"net/http_multipart_builder.cc",
"net/http_multipart_builder.h",
"net/http_transport.cc",
"net/http_transport.h",
"net/url.cc",
"net/url.h",
]
deps = [
":util",
"$mini_chromium_source_parent:base",
]
if (crashpad_is_mac && !crashpad_is_in_fuchsia) {
sources += [ "net/http_transport_mac.mm" ]
}
if (crashpad_is_ios) {
sources += [ "net/http_transport_mac.mm" ]
}
if (crashpad_is_win) {
sources += [ "net/http_transport_win.cc" ]
}
if (crashpad_http_transport_impl == "socket") {
sources += [ "net/http_transport_socket.cc" ]
if (crashpad_use_boringssl_for_http_transport_socket) {
defines += [ "CRASHPAD_USE_BORINGSSL" ]
if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
deps += [ "//third_party/boringssl" ]
} else {
libs = [
"crypto",
"ssl",
]
}
}
} else if (crashpad_http_transport_impl == "libcurl") {
sources += [ "net/http_transport_libcurl.cc" ]
if (crashpad_is_in_fuchsia) {
# Host Linux builds in Fuchsia don't have libcurl in a sysroot.
deps += [ "//third_party/curl:libcurl" ]
}
}
}
if (!crashpad_is_android && !crashpad_is_ios) {
crashpad_executable("http_transport_test_server") {
testonly = true
sources = [ "net/http_transport_test_server.cc" ]
deps = [
":net",
":util",
"$mini_chromium_source_parent:base",
"../third_party/cpp-httplib",
@ -866,6 +888,7 @@ source_set("util_test") {
]
deps = [
":net",
":util",
"$mini_chromium_source_parent:base",
"../client",