Commit 54a98d57 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

Clean up deprecated sources assignment filter in //headless

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

TBR=skyostil@chromium.org

Bug: 1018739
Change-Id: I163c10cfb9ff34ad117fb0b74b6c598a09cfe61c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2442795
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814664}
parent 4f5a7a09
......@@ -16,13 +16,6 @@ import("//tools/grit/grit_rule.gni")
import("//tools/grit/repack.gni")
import("//tools/v8_context_snapshot/v8_context_snapshot.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)
# For code inside the build component "headless".
config("inside_headless_component") {
defines = [ "HEADLESS_IMPLEMENTATION" ]
......@@ -319,11 +312,8 @@ component("headless_non_renderer") {
"lib/browser/headless_browser_context_options.h",
"lib/browser/headless_browser_impl.cc",
"lib/browser/headless_browser_impl.h",
"lib/browser/headless_browser_impl_mac.mm",
"lib/browser/headless_browser_main_parts.cc",
"lib/browser/headless_browser_main_parts.h",
"lib/browser/headless_browser_main_parts_linux.cc",
"lib/browser/headless_browser_main_parts_mac.mm",
"lib/browser/headless_devtools.cc",
"lib/browser/headless_devtools.h",
"lib/browser/headless_devtools_agent_host_client.cc",
......@@ -339,8 +329,6 @@ component("headless_non_renderer") {
"lib/browser/headless_quota_permission_context.h",
"lib/browser/headless_request_context_manager.cc",
"lib/browser/headless_request_context_manager.h",
"lib/browser/headless_shell_application_mac.h",
"lib/browser/headless_shell_application_mac.mm",
"lib/browser/headless_window_tree_host.h",
"lib/browser/protocol/browser_handler.cc",
"lib/browser/protocol/browser_handler.h",
......@@ -360,6 +348,19 @@ component("headless_non_renderer") {
"public/headless_web_contents.h",
]
if (is_mac) {
sources += [
"lib/browser/headless_browser_impl_mac.mm",
"lib/browser/headless_browser_main_parts_mac.mm",
"lib/browser/headless_shell_application_mac.h",
"lib/browser/headless_shell_application_mac.mm",
]
}
if (is_linux || is_chromeos) {
sources += [ "lib/browser/headless_browser_main_parts_linux.cc" ]
}
if (use_aura) {
sources += [
"lib/browser/headless_browser_impl_aura.cc",
......@@ -424,13 +425,16 @@ component("headless_non_renderer") {
"lib/browser/headless_web_contents_impl.h",
"lib/headless_content_main_delegate.cc",
"lib/headless_content_main_delegate.h",
"lib/headless_content_main_delegate_mac.mm",
"lib/renderer/headless_content_renderer_client.cc",
"lib/renderer/headless_content_renderer_client.h",
"lib/utility/headless_content_utility_client.cc",
"lib/utility/headless_content_utility_client.h",
]
if (is_mac) {
sources += [ "lib/headless_content_main_delegate_mac.mm" ]
}
if (enable_basic_printing) {
sources += [
"lib/renderer/headless_print_render_frame_helper_delegate.cc",
......@@ -525,13 +529,16 @@ if (!is_component_build) {
"lib/browser/headless_web_contents_impl.h",
"lib/headless_content_main_delegate.cc",
"lib/headless_content_main_delegate.h",
"lib/headless_content_main_delegate_mac.mm",
"lib/renderer/headless_content_renderer_client.cc",
"lib/renderer/headless_content_renderer_client.h",
"lib/utility/headless_content_utility_client.cc",
"lib/utility/headless_content_utility_client.h",
]
if (is_mac) {
sources += [ "lib/headless_content_main_delegate_mac.mm" ]
}
if (headless_use_embedded_resources) {
defines = [ "HEADLESS_USE_EMBEDDED_RESOURCES" ]
}
......
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