3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2024-12-25 22:30:49 +08:00
Code Issues Projects Releases Wiki Activity

Pull latest toolchain

Browse Source 
The previous CIPD location was stale and the packages there are no
longer updated. Compiling for Fuchsia using the latest toolchain
revealed that zlib needed to be updated as well to resolve errors
thrown by -Wstrict-prototypes.

Newer versions of zlib fail to compile for Fuchsia without the addition
of -Wno-sign-compare, recommended for this situation by the Fuchsia
toolchain team.

Bug: fuchsia:128938
Bug: fuchsia:128939

Change-Id: Iccf6dcb1aef1e1811f458fd18a2f04e7b044a918
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/4893089
Commit-Queue: Thomas Gales <tgales@google.com>
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Thomas Gales 2023-10-06 20:46:54 +00:00 committed by Crashpad LUCI CQ
parent b90db3e47f
commit a1b467ab45
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DEPS
View File

@ -53,7 +53,7 @@ deps = {
'fda403cf93ecb8792cb1d061564d89a6553ca020',
'crashpad/third_party/zlib/zlib':
Var('chromium_git') + '/chromium/src/third_party/zlib@' +
'13dc246a58e4b72104d35f9b1809af95221ebda7',
'fef58692c1d7bec94c4ed3d030a45a1832a9615d',
# CIPD packages.
'buildtools/linux64': {
@ -89,8 +89,8 @@ deps = {
'crashpad/third_party/linux/clang/linux-amd64': {
'packages': [
{
'package': 'fuchsia/clang/linux-amd64',
'version': 'goma',
'package': 'fuchsia/third_party/clang/linux-amd64',
'version': 'Tpc85d1ZwSlZ6UKl2d96GRUBGNA5JKholOKe24sRDr0C',
},
],
'condition': 'checkout_linux and pull_linux_clang',
@ -99,8 +99,8 @@ deps = {
'crashpad/third_party/fuchsia/clang/mac-amd64': {
'packages': [
{
'package': 'fuchsia/clang/mac-amd64',
'version': 'goma',
'package': 'fuchsia/third_party/clang/mac-amd64',
'version': 'MAOjNhwTu5JU3P_0C9dITiyCTtQ1n7lRJnMfB9hhvOkC',
},
],
'condition': 'checkout_fuchsia and host_os == "mac"',
@ -109,8 +109,8 @@ deps = {
'crashpad/third_party/fuchsia/clang/linux-amd64': {
'packages': [
{
'package': 'fuchsia/clang/linux-amd64',
'version': 'goma',
'package': 'fuchsia/third_party/clang/linux-amd64',
'version': 'Tpc85d1ZwSlZ6UKl2d96GRUBGNA5JKholOKe24sRDr0C',
},
],
'condition': 'checkout_fuchsia and host_os == "linux"',

16
third_party/zlib/BUILD.gn vendored
View File

@ -38,6 +38,10 @@ config("zlib_config") {
}
}
config("Wno-sign-compare") {
cflags = [ "-Wno-sign-compare" ]
}
if (zlib_source == "external") {
group("zlib") {
public_configs = [ ":zlib_config" ]
@ -112,6 +116,11 @@ if (zlib_source == "external") {
]
}
if (crashpad_is_fuchsia) {
# Fuchsia build's default warnings include -Wsign-compare (indirectly)
configs += [ ":Wno-sign-compare" ]
}
if (crashpad_is_standalone) {
configs -= [ "//third_party/mini_chromium/mini_chromium/build/config:Wimplicit_fallthrough" ]
} else if (crashpad_is_external) {
@ -119,14 +128,11 @@ if (zlib_source == "external") {
}
if (zlib_source == "embedded") {
sources += [ "$zlib_dir/names.h" ]
sources += [ "$zlib_dir/chromeconf.h" ]
if (current_cpu == "x86" || current_cpu == "x64") {
sources += [
"$zlib_dir/crc_folding.c",
"$zlib_dir/fill_window_sse.c",
"$zlib_dir/x86.c",
"$zlib_dir/x86.h",
]
if (!crashpad_is_win || crashpad_is_clang) {
cflags += [
@ -137,8 +143,6 @@ if (zlib_source == "external") {
if (crashpad_is_clang) {
cflags += [ "-Wno-incompatible-pointer-types" ]
}
} else {
sources += [ "$zlib_dir/simd_stub.c" ]
}
}
}