Commit 58f2c7f2 authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

Reformat all gn files in /third_party/crashpad.

`gn format` recently changed its formatting behavior
for deps, source, and a few other elements when they
are assigned (with =) single-element lists to be consistent
with the formatting of updates (with +=) with single-element.

Now that we've rolled in a GN binary with the change,
reformat all files so that people don't get presubmit
warnings due to this.

This CL was uploaded by git cl split.

R=rsesek@chromium.org

Bug: 1041419
Change-Id: Ifca548356e41020fcfe9e1a89aeaebe64e7bd046
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1997899
Auto-Submit: Nico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734478}
parent 7361057d
...@@ -121,9 +121,7 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) { ...@@ -121,9 +121,7 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
} }
package("crashpad_database_util") { package("crashpad_database_util") {
deps = [ deps = [ "tools:crashpad_database_util" ]
"tools:crashpad_database_util",
]
binaries = [ binaries = [
{ {
......
...@@ -32,9 +32,7 @@ config("crashpad_is_in_fuchsia") { ...@@ -32,9 +32,7 @@ config("crashpad_is_in_fuchsia") {
group("default_exe_manifest_win") { group("default_exe_manifest_win") {
if (crashpad_is_in_chromium) { if (crashpad_is_in_chromium) {
deps = [ deps = [ "//build/win:default_exe_manifest" ]
"//build/win:default_exe_manifest",
]
} }
} }
......
...@@ -90,15 +90,11 @@ static_library("client") { ...@@ -90,15 +90,11 @@ static_library("client") {
} }
if (crashpad_is_linux || crashpad_is_android) { if (crashpad_is_linux || crashpad_is_android) {
deps += [ deps += [ "../third_party/lss" ]
"../third_party/lss",
]
} }
if (crashpad_is_fuchsia) { if (crashpad_is_fuchsia) {
deps += [ deps += [ "../third_party/fuchsia" ]
"../third_party/fuchsia",
]
if (crashpad_is_in_fuchsia) { if (crashpad_is_in_fuchsia) {
deps += [ "//zircon/public/lib/fdio" ] deps += [ "//zircon/public/lib/fdio" ]
} }
...@@ -141,9 +137,7 @@ source_set("client_test") { ...@@ -141,9 +137,7 @@ source_set("client_test") {
"../util", "../util",
] ]
data_deps = [ data_deps = [ "../handler:crashpad_handler" ]
"../handler:crashpad_handler",
]
if (crashpad_is_win) { if (crashpad_is_win) {
data_deps += [ "../handler:crashpad_handler_console" ] data_deps += [ "../handler:crashpad_handler_console" ]
......
...@@ -101,22 +101,16 @@ if (crashpad_is_android) { ...@@ -101,22 +101,16 @@ if (crashpad_is_android) {
# CrashpadHandlerMain is defined in a separate target so that it can be # CrashpadHandlerMain is defined in a separate target so that it can be
# overriden by implementers # overriden by implementers
source_set("crashpad_handler_main") { source_set("crashpad_handler_main") {
sources = [ sources = [ "crashpad_handler_main.cc" ]
"crashpad_handler_main.cc",
]
deps = [ deps = [ ":handler" ]
":handler",
]
} }
} }
source_set("handler_test") { source_set("handler_test") {
testonly = true testonly = true
sources = [ sources = [ "minidump_to_upload_parameters_test.cc" ]
"minidump_to_upload_parameters_test.cc",
]
if (crashpad_is_linux || crashpad_is_android) { if (crashpad_is_linux || crashpad_is_android) {
sources += [ "linux/exception_handler_server_test.cc" ] sources += [ "linux/exception_handler_server_test.cc" ]
...@@ -147,9 +141,7 @@ source_set("handler_test") { ...@@ -147,9 +141,7 @@ source_set("handler_test") {
} }
crashpad_executable("crashpad_handler") { crashpad_executable("crashpad_handler") {
sources = [ sources = [ "main.cc" ]
"main.cc",
]
deps = [ deps = [
":handler", ":handler",
...@@ -177,26 +169,18 @@ crashpad_executable("crashpad_handler") { ...@@ -177,26 +169,18 @@ crashpad_executable("crashpad_handler") {
# handler executable an acceptable name. # handler executable an acceptable name.
if (crashpad_is_android) { if (crashpad_is_android) {
copy("crashpad_handler_named_as_so") { copy("crashpad_handler_named_as_so") {
deps = [ deps = [ ":crashpad_handler" ]
":crashpad_handler",
]
sources = [ sources = [ "$root_out_dir/crashpad_handler" ]
"$root_out_dir/crashpad_handler",
]
outputs = [ outputs = [ "$root_out_dir/libcrashpad_handler.so" ]
"$root_out_dir/libcrashpad_handler.so",
]
} }
crashpad_executable("crashpad_handler_trampoline") { crashpad_executable("crashpad_handler_trampoline") {
set_sources_assignment_filter([]) set_sources_assignment_filter([])
output_name = "libcrashpad_handler_trampoline.so" output_name = "libcrashpad_handler_trampoline.so"
sources = [ sources = [ "linux/handler_trampoline.cc" ]
"linux/handler_trampoline.cc",
]
ldflags = [ "-llog" ] ldflags = [ "-llog" ]
...@@ -211,9 +195,7 @@ if (crashpad_is_android) { ...@@ -211,9 +195,7 @@ if (crashpad_is_android) {
crashpad_executable("crashpad_handler_test_extended_handler") { crashpad_executable("crashpad_handler_test_extended_handler") {
testonly = true testonly = true
sources = [ sources = [ "crashpad_handler_test_extended_handler.cc" ]
"crashpad_handler_test_extended_handler.cc",
]
deps = [ deps = [
":handler", ":handler",
...@@ -227,9 +209,7 @@ crashpad_executable("crashpad_handler_test_extended_handler") { ...@@ -227,9 +209,7 @@ crashpad_executable("crashpad_handler_test_extended_handler") {
if (crashpad_is_win) { if (crashpad_is_win) {
crashpad_executable("crashpad_handler_com") { crashpad_executable("crashpad_handler_com") {
sources = [ sources = [ "main.cc" ]
"main.cc",
]
# Avoid .exp, .ilk, and .lib file collisions with crashpad_handler.exe by # Avoid .exp, .ilk, and .lib file collisions with crashpad_handler.exe by
# having this target produce crashpad_handler_com.com. Don’t use this target # having this target produce crashpad_handler_com.com. Don’t use this target
...@@ -245,23 +225,15 @@ if (crashpad_is_win) { ...@@ -245,23 +225,15 @@ if (crashpad_is_win) {
} }
copy("crashpad_handler_console") { copy("crashpad_handler_console") {
deps = [ deps = [ ":crashpad_handler_com" ]
":crashpad_handler_com", sources = [ "$root_out_dir/crashpad_handler_com.com" ]
] outputs = [ "$root_out_dir/crashpad_handler.com" ]
sources = [
"$root_out_dir/crashpad_handler_com.com",
]
outputs = [
"$root_out_dir/crashpad_handler.com",
]
} }
crashpad_executable("crash_other_program") { crashpad_executable("crash_other_program") {
testonly = true testonly = true
sources = [ sources = [ "win/crash_other_program.cc" ]
"win/crash_other_program.cc",
]
deps = [ deps = [
"../client", "../client",
...@@ -274,9 +246,7 @@ if (crashpad_is_win) { ...@@ -274,9 +246,7 @@ if (crashpad_is_win) {
crashpad_executable("crashy_program") { crashpad_executable("crashy_program") {
testonly = true testonly = true
sources = [ sources = [ "win/crashy_test_program.cc" ]
"win/crashy_test_program.cc",
]
deps = [ deps = [
"../client", "../client",
...@@ -287,9 +257,7 @@ if (crashpad_is_win) { ...@@ -287,9 +257,7 @@ if (crashpad_is_win) {
crashpad_executable("crashy_signal") { crashpad_executable("crashy_signal") {
testonly = true testonly = true
sources = [ sources = [ "win/crashy_signal.cc" ]
"win/crashy_signal.cc",
]
cflags = [ "/wd4702" ] # Unreachable code. cflags = [ "/wd4702" ] # Unreachable code.
...@@ -302,17 +270,13 @@ if (crashpad_is_win) { ...@@ -302,17 +270,13 @@ if (crashpad_is_win) {
crashpad_executable("fake_handler_that_crashes_at_startup") { crashpad_executable("fake_handler_that_crashes_at_startup") {
testonly = true testonly = true
sources = [ sources = [ "win/fake_handler_that_crashes_at_startup.cc" ]
"win/fake_handler_that_crashes_at_startup.cc",
]
} }
crashpad_executable("hanging_program") { crashpad_executable("hanging_program") {
testonly = true testonly = true
sources = [ sources = [ "win/hanging_program.cc" ]
"win/hanging_program.cc",
]
deps = [ deps = [
"../client", "../client",
...@@ -323,17 +287,13 @@ if (crashpad_is_win) { ...@@ -323,17 +287,13 @@ if (crashpad_is_win) {
crashpad_loadable_module("loader_lock_dll") { crashpad_loadable_module("loader_lock_dll") {
testonly = true testonly = true
sources = [ sources = [ "win/loader_lock_dll.cc" ]
"win/loader_lock_dll.cc",
]
} }
crashpad_executable("self_destroying_program") { crashpad_executable("self_destroying_program") {
testonly = true testonly = true
sources = [ sources = [ "win/self_destroying_test_program.cc" ]
"win/self_destroying_test_program.cc",
]
deps = [ deps = [
"../client", "../client",
...@@ -348,9 +308,7 @@ if (crashpad_is_win) { ...@@ -348,9 +308,7 @@ if (crashpad_is_win) {
crashpad_executable("crashy_z7_loader") { crashpad_executable("crashy_z7_loader") {
testonly = true testonly = true
sources = [ sources = [ "win/crashy_test_z7_loader.cc" ]
"win/crashy_test_z7_loader.cc",
]
deps = [ deps = [
"../client", "../client",
......
...@@ -71,9 +71,7 @@ static_library("minidump") { ...@@ -71,9 +71,7 @@ static_library("minidump") {
public_configs = [ "..:crashpad_config" ] public_configs = [ "..:crashpad_config" ]
public_deps = [ public_deps = [ "../compat" ]
"../compat",
]
deps = [ deps = [
"../snapshot", "../snapshot",
...@@ -113,9 +111,7 @@ static_library("test_support") { ...@@ -113,9 +111,7 @@ static_library("test_support") {
public_configs = [ "..:crashpad_config" ] public_configs = [ "..:crashpad_config" ]
public_deps = [ public_deps = [ ":minidump" ]
":minidump",
]
deps = [ deps = [
"../third_party/gtest:gtest", "../third_party/gtest:gtest",
...@@ -154,9 +150,7 @@ source_set("minidump_test") { ...@@ -154,9 +150,7 @@ source_set("minidump_test") {
"minidump_writable_test.cc", "minidump_writable_test.cc",
] ]
configs += [ configs += [ "../build:crashpad_is_in_fuchsia" ]
"../build:crashpad_is_in_fuchsia",
]
deps = [ deps = [
":test_support", ":test_support",
......
...@@ -241,9 +241,7 @@ if (crashpad_is_linux && use_fuzzing_engine) { ...@@ -241,9 +241,7 @@ if (crashpad_is_linux && use_fuzzing_engine) {
# Chromium's fuzzer_test template, it's better to rely on |use_fuzzing_engine| # Chromium's fuzzer_test template, it's better to rely on |use_fuzzing_engine|
# and disable fuzz targets as they will not build successfully without it. # and disable fuzz targets as they will not build successfully without it.
crashpad_fuzzer_test("elf_image_reader_fuzzer") { crashpad_fuzzer_test("elf_image_reader_fuzzer") {
sources = [ sources = [ "elf/elf_image_reader_fuzzer.cc" ]
"elf/elf_image_reader_fuzzer.cc",
]
deps = [ deps = [
":snapshot", ":snapshot",
...@@ -277,9 +275,7 @@ static_library("test_support") { ...@@ -277,9 +275,7 @@ static_library("test_support") {
public_configs = [ "..:crashpad_config" ] public_configs = [ "..:crashpad_config" ]
public_deps = [ public_deps = [ ":snapshot" ]
":snapshot",
]
deps = [ deps = [
"../compat", "../compat",
...@@ -298,9 +294,7 @@ config("snapshot_test_link") { ...@@ -298,9 +294,7 @@ config("snapshot_test_link") {
# There’s no way to make the link depend on this file. “inputs” doesn’t have # There’s no way to make the link depend on this file. “inputs” doesn’t have
# the intended effect in a config. https://crbug.com/781858, # the intended effect in a config. https://crbug.com/781858,
# https://crbug.com/796187. # https://crbug.com/796187.
inputs = [ inputs = [ "elf/test_exported_symbols.sym" ]
"elf/test_exported_symbols.sym",
]
ldflags = [ "-Wl,--dynamic-list," + rebase_path(inputs[0], root_build_dir) ] ldflags = [ "-Wl,--dynamic-list," + rebase_path(inputs[0], root_build_dir) ]
} }
} }
...@@ -434,9 +428,7 @@ source_set("snapshot_test") { ...@@ -434,9 +428,7 @@ source_set("snapshot_test") {
crashpad_loadable_module("crashpad_snapshot_test_module") { crashpad_loadable_module("crashpad_snapshot_test_module") {
testonly = true testonly = true
sources = [ sources = [ "crashpad_info_client_options_test_module.cc" ]
"crashpad_info_client_options_test_module.cc",
]
deps = [ deps = [
"../client", "../client",
"../third_party/mini_chromium:base", "../third_party/mini_chromium:base",
...@@ -445,9 +437,7 @@ crashpad_loadable_module("crashpad_snapshot_test_module") { ...@@ -445,9 +437,7 @@ crashpad_loadable_module("crashpad_snapshot_test_module") {
crashpad_loadable_module("crashpad_snapshot_test_module_large") { crashpad_loadable_module("crashpad_snapshot_test_module_large") {
testonly = true testonly = true
sources = [ sources = [ "crashpad_info_size_test_module.cc" ]
"crashpad_info_size_test_module.cc",
]
deps = [] deps = []
if (crashpad_is_linux || crashpad_is_android || crashpad_is_fuchsia) { if (crashpad_is_linux || crashpad_is_android || crashpad_is_fuchsia) {
...@@ -461,9 +451,7 @@ crashpad_loadable_module("crashpad_snapshot_test_module_large") { ...@@ -461,9 +451,7 @@ crashpad_loadable_module("crashpad_snapshot_test_module_large") {
crashpad_loadable_module("crashpad_snapshot_test_module_small") { crashpad_loadable_module("crashpad_snapshot_test_module_small") {
testonly = true testonly = true
sources = [ sources = [ "crashpad_info_size_test_module.cc" ]
"crashpad_info_size_test_module.cc",
]
deps = [] deps = []
if (crashpad_is_linux || crashpad_is_android || crashpad_is_fuchsia) { if (crashpad_is_linux || crashpad_is_android || crashpad_is_fuchsia) {
...@@ -479,9 +467,7 @@ if ((crashpad_is_linux || crashpad_is_android || crashpad_is_fuchsia) && ...@@ -479,9 +467,7 @@ if ((crashpad_is_linux || crashpad_is_android || crashpad_is_fuchsia) &&
target_cpu != "mipsel" && target_cpu != "mips64el") { target_cpu != "mipsel" && target_cpu != "mips64el") {
crashpad_loadable_module("crashpad_snapshot_test_both_dt_hash_styles") { crashpad_loadable_module("crashpad_snapshot_test_both_dt_hash_styles") {
testonly = true testonly = true
sources = [ sources = [ "hash_types_test.cc" ]
"hash_types_test.cc",
]
# This makes `ld` emit both .hash and .gnu.hash sections. # This makes `ld` emit both .hash and .gnu.hash sections.
ldflags = [ "-Wl,--hash-style=both" ] ldflags = [ "-Wl,--hash-style=both" ]
...@@ -498,18 +484,14 @@ if (crashpad_is_mac) { ...@@ -498,18 +484,14 @@ if (crashpad_is_mac) {
crashpad_executable("crashpad_snapshot_test_no_op") { crashpad_executable("crashpad_snapshot_test_no_op") {
testonly = true testonly = true
sources = [ sources = [ "mac/mach_o_image_annotations_reader_test_no_op.cc" ]
"mac/mach_o_image_annotations_reader_test_no_op.cc",
]
} }
} }
if (crashpad_is_win) { if (crashpad_is_win) {
crashpad_executable("crashpad_snapshot_test_annotations") { crashpad_executable("crashpad_snapshot_test_annotations") {
testonly = true testonly = true
sources = [ sources = [ "win/crashpad_snapshot_test_annotations.cc" ]
"win/crashpad_snapshot_test_annotations.cc",
]
deps = [ deps = [
"../client", "../client",
"../compat", "../compat",
...@@ -519,9 +501,7 @@ if (crashpad_is_win) { ...@@ -519,9 +501,7 @@ if (crashpad_is_win) {
crashpad_executable("crashpad_snapshot_test_crashing_child") { crashpad_executable("crashpad_snapshot_test_crashing_child") {
testonly = true testonly = true
sources = [ sources = [ "win/crashpad_snapshot_test_crashing_child.cc" ]
"win/crashpad_snapshot_test_crashing_child.cc",
]
deps = [ deps = [
"../client", "../client",
"../compat", "../compat",
...@@ -532,9 +512,7 @@ if (crashpad_is_win) { ...@@ -532,9 +512,7 @@ if (crashpad_is_win) {
crashpad_executable("crashpad_snapshot_test_dump_without_crashing") { crashpad_executable("crashpad_snapshot_test_dump_without_crashing") {
testonly = true testonly = true
sources = [ sources = [ "win/crashpad_snapshot_test_dump_without_crashing.cc" ]
"win/crashpad_snapshot_test_dump_without_crashing.cc",
]
deps = [ deps = [
"../client", "../client",
"../compat", "../compat",
...@@ -545,9 +523,7 @@ if (crashpad_is_win) { ...@@ -545,9 +523,7 @@ if (crashpad_is_win) {
crashpad_executable("crashpad_snapshot_test_extra_memory_ranges") { crashpad_executable("crashpad_snapshot_test_extra_memory_ranges") {
testonly = true testonly = true
sources = [ sources = [ "win/crashpad_snapshot_test_extra_memory_ranges.cc" ]
"win/crashpad_snapshot_test_extra_memory_ranges.cc",
]
deps = [ deps = [
"../client", "../client",
"../compat", "../compat",
...@@ -557,9 +533,7 @@ if (crashpad_is_win) { ...@@ -557,9 +533,7 @@ if (crashpad_is_win) {
crashpad_executable("crashpad_snapshot_test_image_reader") { crashpad_executable("crashpad_snapshot_test_image_reader") {
testonly = true testonly = true
sources = [ sources = [ "win/crashpad_snapshot_test_image_reader.cc" ]
"win/crashpad_snapshot_test_image_reader.cc",
]
deps = [ deps = [
"../client", "../client",
"../compat", "../compat",
...@@ -578,9 +552,7 @@ if (crashpad_is_win) { ...@@ -578,9 +552,7 @@ if (crashpad_is_win) {
crashpad_loadable_module("crashpad_snapshot_test_image_reader_module") { crashpad_loadable_module("crashpad_snapshot_test_image_reader_module") {
testonly = true testonly = true
sources = [ sources = [ "win/crashpad_snapshot_test_image_reader_module.cc" ]
"win/crashpad_snapshot_test_image_reader_module.cc",
]
deps = [ deps = [
"../client", "../client",
"../third_party/mini_chromium:base", "../third_party/mini_chromium:base",
......
...@@ -130,9 +130,7 @@ static_library("test") { ...@@ -130,9 +130,7 @@ static_library("test") {
"../build:crashpad_is_in_fuchsia", "../build:crashpad_is_in_fuchsia",
] ]
data = [ data = [ "test_paths_test_data_root.txt" ]
"test_paths_test_data_root.txt",
]
deps = [ deps = [
"../compat", "../compat",
...@@ -161,9 +159,7 @@ static_library("test") { ...@@ -161,9 +159,7 @@ static_library("test") {
} }
if (crashpad_is_fuchsia) { if (crashpad_is_fuchsia) {
public_deps = [ public_deps = [ "../third_party/fuchsia" ]
"../third_party/fuchsia",
]
if (crashpad_is_in_fuchsia) { if (crashpad_is_in_fuchsia) {
deps += [ "//zircon/public/lib/fdio" ] deps += [ "//zircon/public/lib/fdio" ]
} }
...@@ -217,9 +213,7 @@ source_set("test_test") { ...@@ -217,9 +213,7 @@ source_set("test_test") {
"../util", "../util",
] ]
data_deps = [ data_deps = [ ":crashpad_test_test_multiprocess_exec_test_child" ]
":crashpad_test_test_multiprocess_exec_test_child",
]
if (crashpad_is_ios) { if (crashpad_is_ios) {
deps -= [ deps -= [
...@@ -233,13 +227,9 @@ source_set("test_test") { ...@@ -233,13 +227,9 @@ source_set("test_test") {
if (!crashpad_is_ios) { if (!crashpad_is_ios) {
crashpad_executable("crashpad_test_test_multiprocess_exec_test_child") { crashpad_executable("crashpad_test_test_multiprocess_exec_test_child") {
sources = [ sources = [ "multiprocess_exec_test_child.cc" ]
"multiprocess_exec_test_child.cc",
]
deps = [ deps = [ "../third_party/mini_chromium:base" ]
"../third_party/mini_chromium:base",
]
} }
} }
...@@ -260,9 +250,7 @@ if (crashpad_is_ios) { ...@@ -260,9 +250,7 @@ if (crashpad_is_ios) {
static_library("gmock_main") { static_library("gmock_main") {
testonly = true testonly = true
sources = [ sources = [ "gtest_main.cc" ]
"gtest_main.cc",
]
configs += [ "../build:crashpad_is_in_chromium" ] configs += [ "../build:crashpad_is_in_chromium" ]
defines = [ "CRASHPAD_TEST_LAUNCHER_GMOCK" ] defines = [ "CRASHPAD_TEST_LAUNCHER_GMOCK" ]
deps = [ deps = [
...@@ -279,9 +267,7 @@ static_library("gmock_main") { ...@@ -279,9 +267,7 @@ static_library("gmock_main") {
static_library("gtest_main") { static_library("gtest_main") {
testonly = true testonly = true
sources = [ sources = [ "gtest_main.cc" ]
"gtest_main.cc",
]
configs += [ "../build:crashpad_is_in_chromium" ] configs += [ "../build:crashpad_is_in_chromium" ]
defines = [ "CRASHPAD_TEST_LAUNCHER_GTEST" ] defines = [ "CRASHPAD_TEST_LAUNCHER_GTEST" ]
deps = [ deps = [
......
...@@ -13,7 +13,5 @@ ...@@ -13,7 +13,5 @@
# limitations under the License. # limitations under the License.
source_set("apple_cf") { source_set("apple_cf") {
sources = [ sources = [ "CFStreamAbstract.h" ]
"CFStreamAbstract.h",
]
} }
...@@ -15,7 +15,5 @@ ...@@ -15,7 +15,5 @@
source_set("cpp-httplib") { source_set("cpp-httplib") {
testonly = true testonly = true
include_dirs = [ "cpp-httplib" ] include_dirs = [ "cpp-httplib" ]
sources = [ sources = [ "cpp-httplib/httplib.h" ]
"cpp-httplib/httplib.h",
]
} }
...@@ -200,19 +200,13 @@ if (crashpad_is_in_fuchsia) { ...@@ -200,19 +200,13 @@ if (crashpad_is_in_fuchsia) {
cpp_source, cpp_source,
] ]
deps = [ deps = [ ":fidlc_${fidl_source.library_name}" ]
":fidlc_${fidl_source.library_name}",
]
} }
source_set("${fidl_source.library_name}_tables") { source_set("${fidl_source.library_name}_tables") {
sources = [ sources = [ coding_tables ]
coding_tables,
]
deps = [ deps = [ ":fidlc_${fidl_source.library_name}" ]
":fidlc_${fidl_source.library_name}",
]
public_configs = [ ":fidl_config" ] public_configs = [ ":fidl_config" ]
} }
......
...@@ -13,7 +13,5 @@ ...@@ -13,7 +13,5 @@
# limitations under the License. # limitations under the License.
source_set("glibc") { source_set("glibc") {
sources = [ sources = [ "elf/elf.h" ]
"elf/elf.h",
]
} }
...@@ -18,28 +18,20 @@ import("../../build/test.gni") ...@@ -18,28 +18,20 @@ import("../../build/test.gni")
if (crashpad_is_in_chromium) { if (crashpad_is_in_chromium) {
group("gtest") { group("gtest") {
testonly = true testonly = true
public_deps = [ public_deps = [ "//testing/gtest" ]
"//testing/gtest",
]
} }
group("gmock") { group("gmock") {
testonly = true testonly = true
public_deps = [ public_deps = [ "//testing/gmock" ]
"//testing/gmock",
]
} }
} else if (crashpad_is_in_dart || crashpad_is_in_fuchsia) { } else if (crashpad_is_in_dart || crashpad_is_in_fuchsia) {
group("gtest") { group("gtest") {
testonly = true testonly = true
public_deps = [ public_deps = [ "//third_party/googletest:gtest" ]
"//third_party/googletest:gtest",
]
} }
group("gmock") { group("gmock") {
testonly = true testonly = true
public_deps = [ public_deps = [ "//third_party/googletest:gmock" ]
"//third_party/googletest:gmock",
]
} }
} else if (crashpad_is_standalone) { } else if (crashpad_is_standalone) {
config("gtest_private_config") { config("gtest_private_config") {
...@@ -96,9 +88,7 @@ if (crashpad_is_in_chromium) { ...@@ -96,9 +88,7 @@ if (crashpad_is_in_chromium) {
] ]
configs += [ ":gtest_private_config" ] configs += [ ":gtest_private_config" ]
if (crashpad_is_fuchsia) { if (crashpad_is_fuchsia) {
deps = [ deps = [ "../fuchsia" ]
"../fuchsia",
]
} }
} }
...@@ -107,12 +97,8 @@ if (crashpad_is_in_chromium) { ...@@ -107,12 +97,8 @@ if (crashpad_is_in_chromium) {
visibility = [ ":*" ] visibility = [ ":*" ]
testonly = true testonly = true
sources = [ sources = [ "gtest/googletest/src/gtest_main.cc" ]
"gtest/googletest/src/gtest_main.cc", deps = [ ":gtest" ]
]
deps = [
":gtest",
]
} }
test("gtest_all_test") { test("gtest_all_test") {
...@@ -150,31 +136,19 @@ if (crashpad_is_in_chromium) { ...@@ -150,31 +136,19 @@ if (crashpad_is_in_chromium) {
} }
test("gtest_environment_test") { test("gtest_environment_test") {
sources = [ sources = [ "gtest/googletest/test/gtest_environment_test.cc" ]
"gtest/googletest/test/gtest_environment_test.cc",
]
configs += [ ":gtest_private_config" ] configs += [ ":gtest_private_config" ]
deps = [ deps = [ ":gtest" ]
":gtest",
]
} }
test("gtest_listener_test") { test("gtest_listener_test") {
sources = [ sources = [ "gtest/googletest/test/googletest-listener-test.cc" ]
"gtest/googletest/test/googletest-listener-test.cc", deps = [ ":gtest" ]
]
deps = [
":gtest",
]
} }
test("gtest_no_test") { test("gtest_no_test") {
sources = [ sources = [ "gtest/googletest/test/gtest_no_test_unittest.cc" ]
"gtest/googletest/test/gtest_no_test_unittest.cc", deps = [ ":gtest" ]
]
deps = [
":gtest",
]
} }
test("gtest_param_test") { test("gtest_param_test") {
...@@ -187,9 +161,7 @@ if (crashpad_is_in_chromium) { ...@@ -187,9 +161,7 @@ if (crashpad_is_in_chromium) {
"//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors", "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",
] ]
configs += [ ":gtest_private_config" ] configs += [ ":gtest_private_config" ]
deps = [ deps = [ ":gtest" ]
":gtest",
]
if (crashpad_is_clang) { if (crashpad_is_clang) {
cflags_cc = [ cflags_cc = [
...@@ -201,28 +173,18 @@ if (crashpad_is_in_chromium) { ...@@ -201,28 +173,18 @@ if (crashpad_is_in_chromium) {
} }
test("gtest_premature_exit_test") { test("gtest_premature_exit_test") {
sources = [ sources = [ "gtest/googletest/test/gtest_premature_exit_test.cc" ]
"gtest/googletest/test/gtest_premature_exit_test.cc", deps = [ ":gtest" ]
]
deps = [
":gtest",
]
} }
test("gtest_repeat_test") { test("gtest_repeat_test") {
sources = [ sources = [ "gtest/googletest/test/gtest_repeat_test.cc" ]
"gtest/googletest/test/gtest_repeat_test.cc",
]
configs += [ ":gtest_private_config" ] configs += [ ":gtest_private_config" ]
deps = [ deps = [ ":gtest" ]
":gtest",
]
} }
test("gtest_sole_header_test") { test("gtest_sole_header_test") {
sources = [ sources = [ "gtest/googletest/test/gtest_sole_header_test.cc" ]
"gtest/googletest/test/gtest_sole_header_test.cc",
]
deps = [ deps = [
":gtest", ":gtest",
":gtest_main", ":gtest_main",
...@@ -230,22 +192,14 @@ if (crashpad_is_in_chromium) { ...@@ -230,22 +192,14 @@ if (crashpad_is_in_chromium) {
} }
test("gtest_stress_test") { test("gtest_stress_test") {
sources = [ sources = [ "gtest/googletest/test/gtest_stress_test.cc" ]
"gtest/googletest/test/gtest_stress_test.cc",
]
configs += [ ":gtest_private_config" ] configs += [ ":gtest_private_config" ]
deps = [ deps = [ ":gtest" ]
":gtest",
]
} }
test("gtest_unittest_api_test") { test("gtest_unittest_api_test") {
sources = [ sources = [ "gtest/googletest/test/gtest-unittest-api_test.cc" ]
"gtest/googletest/test/gtest-unittest-api_test.cc", deps = [ ":gtest" ]
]
deps = [
":gtest",
]
} }
group("gtest_all_tests") { group("gtest_all_tests") {
...@@ -319,18 +273,14 @@ if (crashpad_is_in_chromium) { ...@@ -319,18 +273,14 @@ if (crashpad_is_in_chromium) {
"//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors", "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",
] ]
configs += [ ":gmock_private_config" ] configs += [ ":gmock_private_config" ]
deps = [ deps = [ ":gtest" ]
":gtest",
]
} }
static_library("gmock_main") { static_library("gmock_main") {
# Tests outside of this file should use ../../test:gmock_main instead. # Tests outside of this file should use ../../test:gmock_main instead.
visibility = [ ":*" ] visibility = [ ":*" ]
testonly = true testonly = true
sources = [ sources = [ "gtest/googlemock/src/gmock_main.cc" ]
"gtest/googlemock/src/gmock_main.cc",
]
deps = [ deps = [
":gmock", ":gmock",
":gtest", ":gtest",
...@@ -389,9 +339,7 @@ if (crashpad_is_in_chromium) { ...@@ -389,9 +339,7 @@ if (crashpad_is_in_chromium) {
} }
test("gmock_stress_test") { test("gmock_stress_test") {
sources = [ sources = [ "gtest/googlemock/test/gmock_stress_test.cc" ]
"gtest/googlemock/test/gmock_stress_test.cc",
]
configs -= [ configs -= [
"//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors", "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",
] ]
......
...@@ -25,7 +25,5 @@ config("lss_config") { ...@@ -25,7 +25,5 @@ config("lss_config") {
source_set("lss") { source_set("lss") {
public_configs = [ ":lss_config" ] public_configs = [ ":lss_config" ]
sources = [ sources = [ "lss.h" ]
"lss.h",
]
} }
...@@ -16,17 +16,11 @@ import("../../build/crashpad_buildconfig.gni") ...@@ -16,17 +16,11 @@ import("../../build/crashpad_buildconfig.gni")
group("base") { group("base") {
if (crashpad_is_in_chromium) { if (crashpad_is_in_chromium) {
public_deps = [ public_deps = [ "//base" ]
"//base",
]
} else if (crashpad_is_standalone || crashpad_is_in_fuchsia) { } else if (crashpad_is_standalone || crashpad_is_in_fuchsia) {
public_deps = [ public_deps = [ "mini_chromium/base" ]
"mini_chromium/base",
]
} else if (crashpad_is_in_dart) { } else if (crashpad_is_in_dart) {
public_deps = [ public_deps = [ "//third_party/mini_chromium/mini_chromium/base" ]
"//third_party/mini_chromium/mini_chromium/base"
]
} }
} }
...@@ -34,8 +28,6 @@ group("base_test_support") { ...@@ -34,8 +28,6 @@ group("base_test_support") {
testonly = true testonly = true
if (crashpad_is_in_chromium) { if (crashpad_is_in_chromium) {
public_deps = [ public_deps = [ "//base/test:test_support" ]
"//base/test:test_support",
]
} }
} }
...@@ -13,7 +13,5 @@ ...@@ -13,7 +13,5 @@
# limitations under the License. # limitations under the License.
source_set("xnu") { source_set("xnu") {
sources = [ sources = [ "EXTERNAL_HEADERS/mach-o/loader.h" ]
"EXTERNAL_HEADERS/mach-o/loader.h",
]
} }
...@@ -36,9 +36,7 @@ config("zlib_config") { ...@@ -36,9 +36,7 @@ config("zlib_config") {
if (zlib_source == "external") { if (zlib_source == "external") {
group("zlib") { group("zlib") {
public_configs = [ ":zlib_config" ] public_configs = [ ":zlib_config" ]
public_deps = [ public_deps = [ "//third_party/zlib" ]
"//third_party/zlib",
]
} }
} else if (zlib_source == "system") { } else if (zlib_source == "system") {
source_set("zlib") { source_set("zlib") {
......
...@@ -22,15 +22,11 @@ source_set("tool_support") { ...@@ -22,15 +22,11 @@ source_set("tool_support") {
public_configs = [ "..:crashpad_config" ] public_configs = [ "..:crashpad_config" ]
deps = [ deps = [ "../third_party/mini_chromium:base" ]
"../third_party/mini_chromium:base",
]
} }
crashpad_executable("crashpad_database_util") { crashpad_executable("crashpad_database_util") {
sources = [ sources = [ "crashpad_database_util.cc" ]
"crashpad_database_util.cc",
]
deps = [ deps = [
":tool_support", ":tool_support",
...@@ -43,9 +39,7 @@ crashpad_executable("crashpad_database_util") { ...@@ -43,9 +39,7 @@ crashpad_executable("crashpad_database_util") {
} }
crashpad_executable("crashpad_http_upload") { crashpad_executable("crashpad_http_upload") {
sources = [ sources = [ "crashpad_http_upload.cc" ]
"crashpad_http_upload.cc",
]
deps = [ deps = [
":tool_support", ":tool_support",
...@@ -57,9 +51,7 @@ crashpad_executable("crashpad_http_upload") { ...@@ -57,9 +51,7 @@ crashpad_executable("crashpad_http_upload") {
} }
crashpad_executable("base94_encoder") { crashpad_executable("base94_encoder") {
sources = [ sources = [ "base94_encoder.cc" ]
"base94_encoder.cc",
]
deps = [ deps = [
":tool_support", ":tool_support",
"../build:default_exe_manifest_win", "../build:default_exe_manifest_win",
...@@ -71,9 +63,7 @@ crashpad_executable("base94_encoder") { ...@@ -71,9 +63,7 @@ crashpad_executable("base94_encoder") {
if (!crashpad_is_fuchsia) { if (!crashpad_is_fuchsia) {
crashpad_executable("generate_dump") { crashpad_executable("generate_dump") {
sources = [ sources = [ "generate_dump.cc" ]
"generate_dump.cc",
]
deps = [ deps = [
":tool_support", ":tool_support",
...@@ -89,9 +79,7 @@ if (!crashpad_is_fuchsia) { ...@@ -89,9 +79,7 @@ if (!crashpad_is_fuchsia) {
# This would be better as a config so that it could be shared with # This would be better as a config so that it could be shared with
# exception_port_tool, but configs can’t alter “inputs”. # exception_port_tool, but configs can’t alter “inputs”.
# https://crbug.com/781858. # https://crbug.com/781858.
inputs = [ inputs = [ "mac/sectaskaccess_info.plist" ]
"mac/sectaskaccess_info.plist",
]
ldflags = [ ldflags = [
"-sectcreate", "-sectcreate",
"__TEXT", "__TEXT",
...@@ -108,9 +96,7 @@ if (!crashpad_is_fuchsia) { ...@@ -108,9 +96,7 @@ if (!crashpad_is_fuchsia) {
if (crashpad_is_mac || crashpad_is_fuchsia) { if (crashpad_is_mac || crashpad_is_fuchsia) {
crashpad_executable("run_with_crashpad") { crashpad_executable("run_with_crashpad") {
sources = [ sources = [ "run_with_crashpad.cc" ]
"run_with_crashpad.cc",
]
deps = [ deps = [
":tool_support", ":tool_support",
...@@ -124,9 +110,7 @@ if (crashpad_is_mac || crashpad_is_fuchsia) { ...@@ -124,9 +110,7 @@ if (crashpad_is_mac || crashpad_is_fuchsia) {
if (crashpad_is_mac) { if (crashpad_is_mac) {
crashpad_executable("catch_exception_tool") { crashpad_executable("catch_exception_tool") {
sources = [ sources = [ "mac/catch_exception_tool.cc" ]
"mac/catch_exception_tool.cc",
]
deps = [ deps = [
":tool_support", ":tool_support",
...@@ -137,15 +121,11 @@ if (crashpad_is_mac) { ...@@ -137,15 +121,11 @@ if (crashpad_is_mac) {
} }
crashpad_executable("exception_port_tool") { crashpad_executable("exception_port_tool") {
sources = [ sources = [ "mac/exception_port_tool.cc" ]
"mac/exception_port_tool.cc",
]
# This would be better as a config so that it could be shared with # This would be better as a config so that it could be shared with
# generate_dump, but configs can’t alter “inputs”. https://crbug.com/781858. # generate_dump, but configs can’t alter “inputs”. https://crbug.com/781858.
inputs = [ inputs = [ "mac/sectaskaccess_info.plist" ]
"mac/sectaskaccess_info.plist",
]
ldflags = [ ldflags = [
"-sectcreate", "-sectcreate",
"__TEXT", "__TEXT",
...@@ -162,9 +142,7 @@ if (crashpad_is_mac) { ...@@ -162,9 +142,7 @@ if (crashpad_is_mac) {
} }
crashpad_executable("on_demand_service_tool") { crashpad_executable("on_demand_service_tool") {
sources = [ sources = [ "mac/on_demand_service_tool.mm" ]
"mac/on_demand_service_tool.mm",
]
libs = [ libs = [
"CoreFoundation.framework", "CoreFoundation.framework",
......
...@@ -466,9 +466,7 @@ static_library("util") { ...@@ -466,9 +466,7 @@ static_library("util") {
include_dirs = [ "$root_gen_dir/third_party/crashpad/crashpad" ] include_dirs = [ "$root_gen_dir/third_party/crashpad/crashpad" ]
} }
public_deps = [ public_deps = [ "../compat" ]
"../compat",
]
deps += [ deps += [
"../third_party/mini_chromium:base", "../third_party/mini_chromium:base",
...@@ -519,9 +517,7 @@ static_library("util") { ...@@ -519,9 +517,7 @@ static_library("util") {
if (!crashpad_is_android) { if (!crashpad_is_android) {
crashpad_executable("http_transport_test_server") { crashpad_executable("http_transport_test_server") {
testonly = true testonly = true
sources = [ sources = [ "net/http_transport_test_server.cc" ]
"net/http_transport_test_server.cc",
]
deps = [ deps = [
":util", ":util",
...@@ -693,9 +689,7 @@ source_set("util_test") { ...@@ -693,9 +689,7 @@ source_set("util_test") {
} }
} }
data = [ data = [ "net/testdata/" ]
"net/testdata/",
]
deps = [ deps = [
":util", ":util",
...@@ -713,9 +707,7 @@ source_set("util_test") { ...@@ -713,9 +707,7 @@ source_set("util_test") {
} }
if (!crashpad_is_android) { if (!crashpad_is_android) {
data_deps = [ data_deps = [ ":http_transport_test_server" ]
":http_transport_test_server",
]
if (crashpad_use_boringssl_for_http_transport_socket) { if (crashpad_use_boringssl_for_http_transport_socket) {
defines = [ "CRASHPAD_USE_BORINGSSL" ] defines = [ "CRASHPAD_USE_BORINGSSL" ]
...@@ -742,25 +734,17 @@ source_set("util_test") { ...@@ -742,25 +734,17 @@ source_set("util_test") {
if (crashpad_is_win) { if (crashpad_is_win) {
crashpad_executable("crashpad_util_test_process_info_test_child") { crashpad_executable("crashpad_util_test_process_info_test_child") {
testonly = true testonly = true
sources = [ sources = [ "win/process_info_test_child.cc" ]
"win/process_info_test_child.cc",
]
} }
crashpad_executable("crashpad_util_test_safe_terminate_process_test_child") { crashpad_executable("crashpad_util_test_safe_terminate_process_test_child") {
testonly = true testonly = true
sources = [ sources = [ "win/safe_terminate_process_test_child.cc" ]
"win/safe_terminate_process_test_child.cc",
]
} }
crashpad_loadable_module("crashpad_util_test_loader_lock_test") { crashpad_loadable_module("crashpad_util_test_loader_lock_test") {
testonly = true testonly = true
sources = [ sources = [ "win/loader_lock_test_dll.cc" ]
"win/loader_lock_test_dll.cc", deps = [ ":util" ]
]
deps = [
":util",
]
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment