diff --git a/DEPS b/DEPS index 94847ae8..116e5b0b 100644 --- a/DEPS +++ b/DEPS @@ -29,7 +29,7 @@ deps = { '5e2b3ddde7cda5eb6bc09a5546a76b00e49d888f', 'crashpad/third_party/mini_chromium/mini_chromium': Var('chromium_git') + '/chromium/mini_chromium@' + - 'd42eb410123667fe94427986d2616795897efa0c', + '6e0fdb2e4966ec44b1ce7b8464fd7c80d1b59203', 'crashpad/third_party/zlib/zlib': Var('chromium_git') + '/chromium/src/third_party/zlib@' + '13dc246a58e4b72104d35f9b1809af95221ebda7', diff --git a/snapshot/BUILD.gn b/snapshot/BUILD.gn index 9bb49ae4..44bb53f6 100644 --- a/snapshot/BUILD.gn +++ b/snapshot/BUILD.gn @@ -56,7 +56,7 @@ static_library("snapshot") { "unloaded_module_snapshot.h", ] - if (crashpad_is_posix) { + if (crashpad_is_posix || crashpad_is_fuchsia) { sources += [ "posix/timezone.cc", "posix/timezone.h", diff --git a/test/BUILD.gn b/test/BUILD.gn index dc2e2a75..a8d65954 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -44,7 +44,7 @@ static_library("test") { "test_paths.h", ] - if (crashpad_is_posix) { + if (crashpad_is_posix || crashpad_is_fuchsia) { sources += [ "scoped_temp_dir_posix.cc" ] if (!crashpad_is_fuchsia) { @@ -140,6 +140,8 @@ source_set("test_test") { "test_paths_test.cc", ] + # TODO(crbug.com/812974): Remove !crashpad_is_fuchsia when Fuchsia is no + # longer treated as a posix platform. if (crashpad_is_posix && !crashpad_is_fuchsia) { sources += [ "multiprocess_posix_test.cc" ] } @@ -155,9 +157,6 @@ source_set("test_test") { ] } - if (!crashpad_is_fuchsia) { - } - deps = [ ":test", "../compat", diff --git a/util/BUILD.gn b/util/BUILD.gn index 1e2c968c..e8f2dc08 100644 --- a/util/BUILD.gn +++ b/util/BUILD.gn @@ -160,7 +160,7 @@ static_library("util") { "thread/worker_thread.h", ] - if (crashpad_is_posix) { + if (crashpad_is_posix || crashpad_is_fuchsia) { sources += [ "file/directory_reader_posix.cc", "file/file_io_posix.cc", @@ -512,7 +512,7 @@ source_set("util_test") { sources += [ "net/http_transport_test.cc" ] } - if (crashpad_is_posix) { + if (crashpad_is_posix || crashpad_is_fuchsia) { if (!crashpad_is_fuchsia) { sources += [ "posix/process_info_test.cc",