Prepare for removal of is_posix from the Fuchsia build

This also rolls crashpad/third_party/mini_chromium/mini_chromium/ d42eb4101..6e0fdb2e4 (2 commits)
d42eb41012..6e0fdb2e49

$ git log d42eb4101..6e0fdb2e4 --date=short --no-merges --format='%ad %ae %s'
2018-04-04 scottmg@chromium.org Repair Linux-with-sysroot build after clang update
2018-04-04 fdegans Prepare for |is_posix| switch in the Fuchsia build

Created with:
  roll-dep crashpad/third_party/mini_chromium/mini_chromium

Bug: chromium:812974
Change-Id: I3d8efc3124c97981eda63f104a7adfb670babab7
Reviewed-on: https://chromium-review.googlesource.com/988231
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Fabrice de Gans-Riberi 2018-04-04 15:12:50 -07:00 committed by Mark Mentovai
parent 08ce02c352
commit 74a56c256b
4 changed files with 7 additions and 8 deletions

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@' +
'd42eb410123667fe94427986d2616795897efa0c', '6e0fdb2e4966ec44b1ce7b8464fd7c80d1b59203',
'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',

View File

@ -56,7 +56,7 @@ static_library("snapshot") {
"unloaded_module_snapshot.h", "unloaded_module_snapshot.h",
] ]
if (crashpad_is_posix) { if (crashpad_is_posix || crashpad_is_fuchsia) {
sources += [ sources += [
"posix/timezone.cc", "posix/timezone.cc",
"posix/timezone.h", "posix/timezone.h",

View File

@ -44,7 +44,7 @@ static_library("test") {
"test_paths.h", "test_paths.h",
] ]
if (crashpad_is_posix) { if (crashpad_is_posix || crashpad_is_fuchsia) {
sources += [ "scoped_temp_dir_posix.cc" ] sources += [ "scoped_temp_dir_posix.cc" ]
if (!crashpad_is_fuchsia) { if (!crashpad_is_fuchsia) {
@ -140,6 +140,8 @@ source_set("test_test") {
"test_paths_test.cc", "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) { if (crashpad_is_posix && !crashpad_is_fuchsia) {
sources += [ "multiprocess_posix_test.cc" ] sources += [ "multiprocess_posix_test.cc" ]
} }
@ -155,9 +157,6 @@ source_set("test_test") {
] ]
} }
if (!crashpad_is_fuchsia) {
}
deps = [ deps = [
":test", ":test",
"../compat", "../compat",

View File

@ -160,7 +160,7 @@ static_library("util") {
"thread/worker_thread.h", "thread/worker_thread.h",
] ]
if (crashpad_is_posix) { if (crashpad_is_posix || crashpad_is_fuchsia) {
sources += [ sources += [
"file/directory_reader_posix.cc", "file/directory_reader_posix.cc",
"file/file_io_posix.cc", "file/file_io_posix.cc",
@ -512,7 +512,7 @@ source_set("util_test") {
sources += [ "net/http_transport_test.cc" ] sources += [ "net/http_transport_test.cc" ]
} }
if (crashpad_is_posix) { if (crashpad_is_posix || crashpad_is_fuchsia) {
if (!crashpad_is_fuchsia) { if (!crashpad_is_fuchsia) {
sources += [ sources += [
"posix/process_info_test.cc", "posix/process_info_test.cc",