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

fuchsia: Fix build vs. TLS support when in-tree

Browse Source 
Depend on the BoringSSL target instead of the libs when building in the
Fuchsia tree.

Bug: crashpad:196
Change-Id: Ib1faa9335eedff1fd9dd072234df2d48612ab423
Reviewed-on: https://chromium-review.googlesource.com/1079434
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
Commit-Queue: Scott Graham <scottmg@chromium.org>
This commit is contained in:
Scott Graham 2018-05-30 15:08:18 -07:00 committed by Commit Bot
parent 26ef5c910f
commit dc22f05f61
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/BUILD.gn
View File

@ -248,15 +248,24 @@ static_library("util") {
sources += get_target_outputs(":mig") sources += get_target_outputs(":mig")
} }
deps = []
if (crashpad_is_linux || crashpad_is_fuchsia) { if (crashpad_is_linux || crashpad_is_fuchsia) {
sources += [ "net/http_transport_socket.cc" ] sources += [ "net/http_transport_socket.cc" ]
if (use_boringssl_for_http_transport_socket) { if (use_boringssl_for_http_transport_socket) {
defines = [ "CRASHPAD_USE_BORINGSSL" ] defines = [ "CRASHPAD_USE_BORINGSSL" ]
if (crashpad_is_in_fuchsia) {
deps += [
"//third_party/boringssl"
]
} else {
libs = [ libs = [
"crypto", "crypto",
"ssl", "ssl",
] ]
} }
}
} else if (crashpad_is_android) { } else if (crashpad_is_android) {
sources += [ "net/http_transport_none.cc" ] sources += [ "net/http_transport_none.cc" ]
} }
@ -411,7 +420,7 @@ static_library("util") {
"../compat", "../compat",
] ]
deps = [ deps += [
"../third_party/mini_chromium:base", "../third_party/mini_chromium:base",
"../third_party/zlib", "../third_party/zlib",
] ]
@ -483,12 +492,19 @@ if (!crashpad_is_android) {
if (use_boringssl_for_http_transport_socket) { if (use_boringssl_for_http_transport_socket) {
data_deps = [ ":generate_test_server_key" ] data_deps = [ ":generate_test_server_key" ]
defines = [ "CRASHPAD_USE_BORINGSSL" ] defines = [ "CRASHPAD_USE_BORINGSSL" ]
if (crashpad_is_in_fuchsia) {
deps += [
"//third_party/boringssl"
]
} else {
libs = [ libs = [
"crypto", "crypto",
"ssl", "ssl",
] ]
} }
} }
}
} }
source_set("util_test") { source_set("util_test") {