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

Clean up deprecated sources assignment filter in //components/viz

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

Bug: 1018739
Change-Id: Icb49329e594d7ea9cf3dd3f467cb1fb58d7911c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2445480Reviewed-by: default avatardanakj <danakj@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813652}
parent 4526fce9
......@@ -7,13 +7,6 @@ import("//gpu/vulkan/features.gni")
import("//skia/features.gni")
import("//testing/test.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)
source_set("resource_format") {
sources = [ "resources/resource_format.h" ]
}
......@@ -26,7 +19,6 @@ viz_component("resource_format_utils") {
sources = [
"resources/resource_format_utils.cc",
"resources/resource_format_utils.h",
"resources/resource_format_utils_mac.mm",
"resources/resource_sizes.h",
"viz_resource_format_export.h",
]
......@@ -47,6 +39,9 @@ viz_component("resource_format_utils") {
if (enable_vulkan) {
deps += [ "//third_party/vulkan_headers" ]
}
if (is_mac) {
sources += [ "resources/resource_format_utils_mac.mm" ]
}
}
# TODO(sgilhuly): To reduce link times, merge these context provider components
......
......@@ -9,13 +9,6 @@ import("//media/gpu/args.gni")
import("//skia/features.gni")
import("//testing/libfuzzer/fuzzer_test.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("viz_service_implementation") {
}
......@@ -113,8 +106,6 @@ viz_component("service") {
"display_embedder/gl_output_surface.h",
"display_embedder/gl_output_surface_buffer_queue.cc",
"display_embedder/gl_output_surface_buffer_queue.h",
"display_embedder/gl_output_surface_chromeos.cc",
"display_embedder/gl_output_surface_chromeos.h",
"display_embedder/gl_output_surface_offscreen.cc",
"display_embedder/gl_output_surface_offscreen.h",
"display_embedder/in_process_gpu_memory_buffer_manager.cc",
......@@ -239,6 +230,10 @@ viz_component("service") {
}
if (is_chromeos) {
sources += [
"display_embedder/gl_output_surface_chromeos.cc",
"display_embedder/gl_output_surface_chromeos.h",
]
deps += [ "//components/arc/video_accelerator" ]
}
......
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