From 0e03f8e7fa3f568908849adb77e0e36b5a44b949 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 2 Oct 2020 11:23:18 -0400 Subject: [PATCH] Remove now-no-op set_sources_assignment_filter calls After https://chromium-review.googlesource.com/c/chromium/src/+/2426564, not having a sources assignments filter is the default. No behavior change. Bug: chromium:1018739 Change-Id: Ia2e6af0d613d3cbdfe6595bfe1f688c1efd55f39 Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2446269 Reviewed-by: Mark Mentovai --- BUILD.gn | 5 ----- client/BUILD.gn | 5 ----- compat/BUILD.gn | 5 ----- handler/BUILD.gn | 5 ----- minidump/BUILD.gn | 5 ----- snapshot/BUILD.gn | 3 --- test/BUILD.gn | 5 ----- test/ios/BUILD.gn | 3 --- test/ios/host/BUILD.gn | 3 --- tools/BUILD.gn | 5 ----- util/BUILD.gn | 3 --- 11 files changed, 47 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 98d7390d..7c0a7940 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -16,11 +16,6 @@ import("build/crashpad_buildconfig.gni") import("build/test.gni") import("util/net/tls.gni") -if (crashpad_is_in_chromium) { - # Prevent Chromium source assignment filters from being inherited. - set_sources_assignment_filter([]) -} - config("crashpad_config") { include_dirs = [ "." ] } diff --git a/client/BUILD.gn b/client/BUILD.gn index ca55ad42..4a5f34ad 100644 --- a/client/BUILD.gn +++ b/client/BUILD.gn @@ -14,11 +14,6 @@ import("../build/crashpad_buildconfig.gni") -if (crashpad_is_in_chromium) { - # Prevent Chromium source assignment filters from being inherited. - set_sources_assignment_filter([]) -} - crashpad_static_library("client") { sources = [ "annotation.cc", diff --git a/compat/BUILD.gn b/compat/BUILD.gn index 9bb2306f..54d9acb2 100644 --- a/compat/BUILD.gn +++ b/compat/BUILD.gn @@ -14,11 +14,6 @@ import("../build/crashpad_buildconfig.gni") -if (crashpad_is_in_chromium) { - # Prevent Chromium source assignment filters from being inherited. - set_sources_assignment_filter([]) -} - config("compat_config") { include_dirs = [] diff --git a/handler/BUILD.gn b/handler/BUILD.gn index 0eab2ff9..04adb7ff 100644 --- a/handler/BUILD.gn +++ b/handler/BUILD.gn @@ -14,11 +14,6 @@ import("../build/crashpad_buildconfig.gni") -if (crashpad_is_in_chromium) { - # Prevent Chromium source assignment filters from being inherited. - set_sources_assignment_filter([]) -} - static_library("handler") { sources = [ "crash_report_upload_thread.cc", diff --git a/minidump/BUILD.gn b/minidump/BUILD.gn index d07c1dd4..6217edeb 100644 --- a/minidump/BUILD.gn +++ b/minidump/BUILD.gn @@ -14,11 +14,6 @@ import("../build/crashpad_buildconfig.gni") -if (crashpad_is_in_chromium) { - # Prevent Chromium source assignment filters from being inherited. - set_sources_assignment_filter([]) -} - crashpad_static_library("minidump") { sources = [ "minidump_annotation_writer.cc", diff --git a/snapshot/BUILD.gn b/snapshot/BUILD.gn index 49a809a6..6ca9bd40 100644 --- a/snapshot/BUILD.gn +++ b/snapshot/BUILD.gn @@ -17,9 +17,6 @@ import("../build/crashpad_fuzzer_test.gni") if (crashpad_is_in_chromium) { import("//build/config/compiler/compiler.gni") - - # Prevent Chromium source assignment filters from being inherited. - set_sources_assignment_filter([]) } crashpad_static_library("snapshot") { diff --git a/test/BUILD.gn b/test/BUILD.gn index e225e47e..93485740 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -14,11 +14,6 @@ import("../build/crashpad_buildconfig.gni") -if (crashpad_is_in_chromium) { - # Prevent Chromium source assignment filters from being inherited. - set_sources_assignment_filter([]) -} - static_library("test") { testonly = true diff --git a/test/ios/BUILD.gn b/test/ios/BUILD.gn index cbf8ef89..59dd35d5 100644 --- a/test/ios/BUILD.gn +++ b/test/ios/BUILD.gn @@ -16,9 +16,6 @@ import("../../build/crashpad_buildconfig.gni") if (crashpad_is_in_chromium) { import("//build/config/ios/rules.gni") - - # Prevent Chromium source assignment filters from being inherited. - set_sources_assignment_filter([]) } else if (crashpad_is_standalone) { import("//third_party/mini_chromium/mini_chromium/build/ios/rules.gni") } diff --git a/test/ios/host/BUILD.gn b/test/ios/host/BUILD.gn index 0a14f179..20f25003 100644 --- a/test/ios/host/BUILD.gn +++ b/test/ios/host/BUILD.gn @@ -16,9 +16,6 @@ import("../../../build/crashpad_buildconfig.gni") if (crashpad_is_in_chromium) { import("//build/config/ios/rules.gni") - - # Prevent Chromium source assignment filters from being inherited. - set_sources_assignment_filter([]) } else if (crashpad_is_standalone) { import("//third_party/mini_chromium/mini_chromium/build/ios/rules.gni") } diff --git a/tools/BUILD.gn b/tools/BUILD.gn index 592e0ad5..7da109bc 100644 --- a/tools/BUILD.gn +++ b/tools/BUILD.gn @@ -14,11 +14,6 @@ import("../build/crashpad_buildconfig.gni") -if (crashpad_is_in_chromium) { - # Prevent Chromium source assignment filters from being inherited. - set_sources_assignment_filter([]) -} - source_set("tool_support") { sources = [ "tool_support.cc", diff --git a/util/BUILD.gn b/util/BUILD.gn index 3a26c6e8..ab0d3294 100644 --- a/util/BUILD.gn +++ b/util/BUILD.gn @@ -17,9 +17,6 @@ import("net/tls.gni") if (crashpad_is_in_chromium) { import("//build/config/sanitizers/sanitizers.gni") - - # Prevent Chromium source assignment filters from being inherited. - set_sources_assignment_filter([]) } if (crashpad_is_mac || crashpad_is_ios) {