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: Update includes for new fdio header location

Browse Source 
Also includes a gtest roll, which includes a change in gtest to do the
same thing. This also removes the link against launchpad which is no
longer necessary, and will be removed from the SDK soon.

Bug: crashpad:196, chromium:848028, chromium:850757
Change-Id: Ica8632a6157b585d6b44073e05bf7aa43253e305
Reviewed-on: https://chromium-review.googlesource.com/1096353
Commit-Queue: Scott Graham <scottmg@chromium.org>
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
This commit is contained in:
Scott Graham 2018-06-12 09:32:52 -07:00 committed by Commit Bot
parent d1e6a2130d
commit bff3594594
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -23,7 +23,7 @@ deps = {
'6fe4a3251488f7af86d64fc25cf442e817cf6133', '6fe4a3251488f7af86d64fc25cf442e817cf6133',
'crashpad/third_party/gtest/gtest': 'crashpad/third_party/gtest/gtest':
Var('chromium_git') + '/external/github.com/google/googletest@' + Var('chromium_git') + '/external/github.com/google/googletest@' +
'145d05750b15324899473340c8dd5af50d125d33', 'c091b0469ab4c04ee9411ef770f32360945f4c53',
'crashpad/third_party/gyp/gyp': 'crashpad/third_party/gyp/gyp':
Var('chromium_git') + '/external/gyp@' + Var('chromium_git') + '/external/gyp@' +
'5e2b3ddde7cda5eb6bc09a5546a76b00e49d888f', '5e2b3ddde7cda5eb6bc09a5546a76b00e49d888f',

2
client/crashpad_client_fuchsia.cc
View File

@ -14,7 +14,7 @@
#include "client/crashpad_client.h" #include "client/crashpad_client.h"
#include <fdio/spawn.h> #include <lib/fdio/spawn.h>
#include <zircon/process.h> #include <zircon/process.h>
#include <zircon/processargs.h> #include <zircon/processargs.h>

4
test/multiprocess_exec_fuchsia.cc
View File

@ -14,8 +14,8 @@
#include "test/multiprocess_exec.h" #include "test/multiprocess_exec.h"
#include <fdio/io.h> #include <lib/fdio/io.h>
#include <fdio/spawn.h> #include <lib/fdio/spawn.h>
#include <zircon/process.h> #include <zircon/process.h>
#include <zircon/processargs.h> #include <zircon/processargs.h>
#include <zircon/syscalls.h> #include <zircon/syscalls.h>

6
third_party/gtest/BUILD.gn vendored
View File

@ -46,9 +46,6 @@ 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) {
libs = [ "launchpad" ]
}
} }
config("gtest_public_config") { config("gtest_public_config") {
@ -265,9 +262,6 @@ 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) {
libs = [ "launchpad" ]
}
} }
config("gmock_public_config") { config("gmock_public_config") {

2
tools/run_with_crashpad.cc
View File

@ -32,7 +32,7 @@
#include "util/string/split_string.h" #include "util/string/split_string.h"
#if defined(OS_FUCHSIA) #if defined(OS_FUCHSIA)
#include <fdio/spawn.h> #include <lib/fdio/spawn.h>
#include <zircon/process.h> #include <zircon/process.h>
#include <zircon/syscalls.h> #include <zircon/syscalls.h>