Commit b400a21e authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

Clean up deprecated sources assignment filter in //third_party/breakpad

Remove deprecated_default_sources_assignment_filter and replace
it with explicit is_win, is_mac, etc. sections.

Bug: 1018739
Change-Id: I804134a7a0042fb2c1172e4d5163f760178a8ee8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2442737Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813148}
parent 40c978e6
...@@ -10,13 +10,6 @@ if (is_win) { ...@@ -10,13 +10,6 @@ if (is_win) {
import("//build/config/win/visual_studio_version.gni") import("//build/config/win/visual_studio_version.gni")
} }
# This file depends on the legacy global sources assignment filter. It should
# be converted to check target platform before assigning source files to the
# sources variable. Remove this import and set_sources_assignment_filter call
# when the file has been converted. See https://crbug.com/1018739 for details.
import("//build/config/deprecated_default_sources_assignment_filter.gni")
set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
config("tools_config") { config("tools_config") {
include_dirs = [ include_dirs = [
"breakpad/src", "breakpad/src",
...@@ -88,8 +81,6 @@ if (!is_win) { ...@@ -88,8 +81,6 @@ if (!is_win) {
if (current_toolchain == host_toolchain) { if (current_toolchain == host_toolchain) {
# Contains the code shared by both {micro,mini}dump_stackwalk. # Contains the code shared by both {micro,mini}dump_stackwalk.
static_library("stackwalk_common") { static_library("stackwalk_common") {
# Always want these files included regardless of platform.
set_sources_assignment_filter([])
sources = [ sources = [
"breakpad/src/common/path_helper.cc", "breakpad/src/common/path_helper.cc",
"breakpad/src/common/path_helper.h", "breakpad/src/common/path_helper.h",
...@@ -194,8 +185,6 @@ if (!is_win) { ...@@ -194,8 +185,6 @@ if (!is_win) {
"max_len=128000", "max_len=128000",
] ]
# Always want these files included regardless of platform.
set_sources_assignment_filter([])
sources += [ sources += [
"breakpad/src/processor/exploitability_linux.cc", "breakpad/src/processor/exploitability_linux.cc",
"breakpad/src/processor/exploitability_linux.h", "breakpad/src/processor/exploitability_linux.h",
...@@ -234,8 +223,6 @@ if (!is_win) { ...@@ -234,8 +223,6 @@ if (!is_win) {
configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ]
configs += default_breakpad_configs configs += default_breakpad_configs
# Always want these files included regardless of platform.
set_sources_assignment_filter([])
sources += [ sources += [
"breakpad/src/processor/exploitability_linux.cc", "breakpad/src/processor/exploitability_linux.cc",
"breakpad/src/processor/exploitability_linux.h", "breakpad/src/processor/exploitability_linux.h",
...@@ -247,7 +234,6 @@ if (!is_win) { ...@@ -247,7 +234,6 @@ if (!is_win) {
} }
executable("minidump_dump") { executable("minidump_dump") {
set_sources_assignment_filter([])
sources = [ sources = [
"breakpad/src/processor/basic_code_module.h", "breakpad/src/processor/basic_code_module.h",
"breakpad/src/processor/basic_code_modules.cc", "breakpad/src/processor/basic_code_modules.cc",
...@@ -576,8 +562,6 @@ if (is_linux || is_chromeos || is_android) { ...@@ -576,8 +562,6 @@ if (is_linux || is_chromeos || is_android) {
} }
static_library("client") { static_library("client") {
# Want all these sources for both Linux and Android.
set_sources_assignment_filter([])
sources = [ sources = [
"breakpad/src/client/linux/crash_generation/crash_generation_client.cc", "breakpad/src/client/linux/crash_generation/crash_generation_client.cc",
"breakpad/src/client/linux/crash_generation/crash_generation_client.h", "breakpad/src/client/linux/crash_generation/crash_generation_client.h",
...@@ -658,7 +642,6 @@ if (is_linux || is_chromeos || is_android) { ...@@ -658,7 +642,6 @@ if (is_linux || is_chromeos || is_android) {
} }
static_library("processor_support") { static_library("processor_support") {
set_sources_assignment_filter([])
sources = [ sources = [
"breakpad/src/common/scoped_ptr.h", "breakpad/src/common/scoped_ptr.h",
"breakpad/src/processor/basic_code_modules.cc", "breakpad/src/processor/basic_code_modules.cc",
...@@ -688,7 +671,6 @@ if (is_linux || is_chromeos || is_android) { ...@@ -688,7 +671,6 @@ if (is_linux || is_chromeos || is_android) {
} }
test("breakpad_unittests") { test("breakpad_unittests") {
set_sources_assignment_filter([])
sources = [ sources = [
"breakpad/src/client/linux/handler/exception_handler_unittest.cc", "breakpad/src/client/linux/handler/exception_handler_unittest.cc",
"breakpad/src/client/linux/minidump_writer/cpu_set_unittest.cc", "breakpad/src/client/linux/minidump_writer/cpu_set_unittest.cc",
...@@ -759,7 +741,6 @@ if (is_linux || is_chromeos || is_android) { ...@@ -759,7 +741,6 @@ if (is_linux || is_chromeos || is_android) {
} }
executable("linux_dumper_unittest_helper") { executable("linux_dumper_unittest_helper") {
set_sources_assignment_filter([])
testonly = true testonly = true
sources = [ "breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc" ] sources = [ "breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc" ]
deps = [ ":processor_support" ] deps = [ ":processor_support" ]
...@@ -772,7 +753,6 @@ if (is_linux || is_chromeos || is_android) { ...@@ -772,7 +753,6 @@ if (is_linux || is_chromeos || is_android) {
} }
executable("generate_test_dump") { executable("generate_test_dump") {
set_sources_assignment_filter([])
testonly = true testonly = true
sources = [ "linux/generate-test-dump.cc" ] sources = [ "linux/generate-test-dump.cc" ]
...@@ -791,7 +771,6 @@ if (is_linux || is_chromeos || is_android) { ...@@ -791,7 +771,6 @@ if (is_linux || is_chromeos || is_android) {
} }
executable("minidump-2-core") { executable("minidump-2-core") {
set_sources_assignment_filter([])
sources = [ sources = [
"breakpad/src/common/path_helper.cc", "breakpad/src/common/path_helper.cc",
"breakpad/src/common/path_helper.h", "breakpad/src/common/path_helper.h",
...@@ -804,7 +783,6 @@ if (is_linux || is_chromeos || is_android) { ...@@ -804,7 +783,6 @@ if (is_linux || is_chromeos || is_android) {
} }
executable("core-2-minidump") { executable("core-2-minidump") {
set_sources_assignment_filter([])
sources = [ "breakpad/src/tools/linux/core2md/core2md.cc" ] sources = [ "breakpad/src/tools/linux/core2md/core2md.cc" ]
deps = [ ":client" ] deps = [ ":client" ]
...@@ -1016,7 +994,6 @@ if (is_win) { ...@@ -1016,7 +994,6 @@ if (is_win) {
if (is_ios) { if (is_ios) {
static_library("client") { static_library("client") {
set_sources_assignment_filter([])
sources = [ sources = [
"breakpad/src/client/ios/Breakpad.h", "breakpad/src/client/ios/Breakpad.h",
"breakpad/src/client/ios/Breakpad.mm", "breakpad/src/client/ios/Breakpad.mm",
...@@ -1065,7 +1042,6 @@ if (is_ios) { ...@@ -1065,7 +1042,6 @@ if (is_ios) {
"breakpad/src/common/string_conversion.h", "breakpad/src/common/string_conversion.h",
"breakpad/src/google_breakpad/common/minidump_format.h", "breakpad/src/google_breakpad/common/minidump_format.h",
] ]
set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
include_dirs = [ include_dirs = [
"breakpad/src", "breakpad/src",
......
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