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

win: use version.lib instead of mincore.lib

Browse Source 
Also enable wd4702: unreachable code for zlib and gtest.

Change-Id: Ie1603b16e96f29b6ac82a1122c5ab5a8942eef24
Reviewed-on: https://chromium-review.googlesource.com/955895
Commit-Queue: Joshua Peraza <jperaza@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Joshua Peraza 2018-03-09 13:20:09 -08:00
parent 4375233ad2
commit 8175825f45
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
third_party/gtest/BUILD.gn vendored
View File

@ -138,6 +138,10 @@ if (crashpad_is_in_chromium) {
":gtest", ":gtest",
":gtest_main", ":gtest_main",
] ]
if (crashpad_is_win) {
cflags = [ "/wd4702" ] # unreachable code
}
} }
test("gtest_environment_test") { test("gtest_environment_test") {

1
third_party/zlib/BUILD.gn vendored
View File

@ -89,6 +89,7 @@ if (zlib_source == "external") {
"/wd4245", # conversion from 't1' to 't2', signed/unsigned mismatch "/wd4245", # conversion from 't1' to 't2', signed/unsigned mismatch
"/wd4267", # conversion from 'size_t' to 't', possible loss of data "/wd4267", # conversion from 'size_t' to 't', possible loss of data
"/wd4324", # structure was padded due to alignment specifier "/wd4324", # structure was padded due to alignment specifier
"/wd4702", # unreachable code
] ]
} else { } else {
defines += [ defines += [

6
util/BUILD.gn
View File

@ -425,8 +425,12 @@ static_library("util") {
if (crashpad_is_win) { if (crashpad_is_win) {
libs = [ libs = [
"mincore.lib",
"user32.lib", "user32.lib",
# TODO(jperaza): version.lib is needed for Windows 7 compatibility.
# mincore.lib may be linked against instead when targeting Windows 8+.
"version.lib",
"winhttp.lib", "winhttp.lib",
] ]