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

fuchsia: Re-add launchpad for now

Browse Source 
launchpad usage directly in Crashpad was removed, but gtest still uses
launchpad (for death tests) so keep it here for now (until the gtest
upstream change has landed to remove launchpad there).

Also, roll mini_chromium and remove link of zircon, since that's in the
base configuration now.

Bug: crashpad:196
Change-Id: I68b1092aaa6fc31efe693e3fcd5bde71c2d91d42
Reviewed-on: https://chromium-review.googlesource.com/1083611
Commit-Queue: Scott Graham <scottmg@chromium.org>
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
This commit is contained in:
Scott Graham 2018-06-01 16:15:59 -07:00 committed by Commit Bot
parent 51ebe79f06
commit 9de3535bbb
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -29,7 +29,7 @@ deps = {
'5e2b3ddde7cda5eb6bc09a5546a76b00e49d888f', '5e2b3ddde7cda5eb6bc09a5546a76b00e49d888f',
'crashpad/third_party/mini_chromium/mini_chromium': 'crashpad/third_party/mini_chromium/mini_chromium':
Var('chromium_git') + '/chromium/mini_chromium@' + Var('chromium_git') + '/chromium/mini_chromium@' +
'53a3ff4cf81adb25fdf764e8547a8515fc8f70c2', 'd5a36d3c51a7a270afc2c888baaaec2a6e496219',
'crashpad/third_party/zlib/zlib': 'crashpad/third_party/zlib/zlib':
Var('chromium_git') + '/chromium/src/third_party/zlib@' + Var('chromium_git') + '/chromium/src/third_party/zlib@' +
'13dc246a58e4b72104d35f9b1809af95221ebda7', '13dc246a58e4b72104d35f9b1809af95221ebda7',

10
third_party/gtest/BUILD.gn vendored
View File

@ -46,11 +46,8 @@ if (crashpad_is_in_chromium) {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ "gtest/googletest" ] include_dirs = [ "gtest/googletest" ]
defines = [ "GUNIT_NO_GOOGLE3=1" ] defines = [ "GUNIT_NO_GOOGLE3=1" ]
if (crashpad_is_fuchsia) { if (crashpad_is_fuchsia) {
libs = [ libs = [ "launchpad" ]
"zircon",
]
} }
} }
@ -268,11 +265,8 @@ if (crashpad_is_in_chromium) {
config("gmock_private_config") { config("gmock_private_config") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ "gtest/googlemock" ] include_dirs = [ "gtest/googlemock" ]
if (crashpad_is_fuchsia) { if (crashpad_is_fuchsia) {
libs = [ libs = [ "launchpad" ]
"zircon",
]
} }
} }