Commit 8ae68f87 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

Clean up deprecated sources assignment filter in //content/renderer

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

Bug: 1018739
Change-Id: Ie0bee9e12430577ed050d6dd1d75468395c59d99
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2445551
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatardanakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814317}
parent 0804bd81
...@@ -11,13 +11,6 @@ import("//ppapi/buildflags/buildflags.gni") ...@@ -11,13 +11,6 @@ import("//ppapi/buildflags/buildflags.gni")
import("//third_party/webrtc/webrtc.gni") import("//third_party/webrtc/webrtc.gni")
import("//tools/ipc_fuzzer/ipc_fuzzer.gni") import("//tools/ipc_fuzzer/ipc_fuzzer.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)
if (is_component_build) { if (is_component_build) {
link_target_type = "source_set" link_target_type = "source_set"
} else { } else {
...@@ -90,14 +83,6 @@ target(link_target_type, "renderer") { ...@@ -90,14 +83,6 @@ target(link_target_type, "renderer") {
"in_process_renderer_thread.h", "in_process_renderer_thread.h",
"internal_document_state_data.cc", "internal_document_state_data.cc",
"internal_document_state_data.h", "internal_document_state_data.h",
"java/gin_java_bridge_dispatcher.cc",
"java/gin_java_bridge_dispatcher.h",
"java/gin_java_bridge_object.cc",
"java/gin_java_bridge_object.h",
"java/gin_java_bridge_value_converter.cc",
"java/gin_java_bridge_value_converter.h",
"java/gin_java_function_invocation_helper.cc",
"java/gin_java_function_invocation_helper.h",
"loader/child_url_loader_factory_bundle.cc", "loader/child_url_loader_factory_bundle.cc",
"loader/child_url_loader_factory_bundle.h", "loader/child_url_loader_factory_bundle.h",
"loader/navigation_body_loader.cc", "loader/navigation_body_loader.cc",
...@@ -122,18 +107,6 @@ target(link_target_type, "renderer") { ...@@ -122,18 +107,6 @@ target(link_target_type, "renderer") {
"loader/web_url_request_util.h", "loader/web_url_request_util.h",
"loader/web_worker_fetch_context_impl.cc", "loader/web_worker_fetch_context_impl.cc",
"loader/web_worker_fetch_context_impl.h", "loader/web_worker_fetch_context_impl.h",
"media/android/flinging_renderer_client.cc",
"media/android/flinging_renderer_client.h",
"media/android/flinging_renderer_client_factory.cc",
"media/android/flinging_renderer_client_factory.h",
"media/android/media_player_renderer_client.cc",
"media/android/media_player_renderer_client.h",
"media/android/media_player_renderer_client_factory.cc",
"media/android/media_player_renderer_client_factory.h",
"media/android/stream_texture_factory.cc",
"media/android/stream_texture_factory.h",
"media/android/stream_texture_wrapper_impl.cc",
"media/android/stream_texture_wrapper_impl.h",
"media/audio_decoder.cc", "media/audio_decoder.cc",
"media/audio_decoder.h", "media/audio_decoder.h",
"media/batching_media_log.cc", "media/batching_media_log.cc",
...@@ -186,8 +159,6 @@ target(link_target_type, "renderer") { ...@@ -186,8 +159,6 @@ target(link_target_type, "renderer") {
"render_thread_impl.h", "render_thread_impl.h",
"render_view_impl.cc", "render_view_impl.cc",
"render_view_impl.h", "render_view_impl.h",
"render_view_linux.cc",
"render_view_win.cc",
"render_widget.cc", "render_widget.cc",
"render_widget.h", "render_widget.h",
"render_widget_delegate.h", "render_widget_delegate.h",
...@@ -197,14 +168,8 @@ target(link_target_type, "renderer") { ...@@ -197,14 +168,8 @@ target(link_target_type, "renderer") {
"renderer_blink_platform_impl.h", "renderer_blink_platform_impl.h",
"renderer_main.cc", "renderer_main.cc",
"renderer_main_platform_delegate.h", "renderer_main_platform_delegate.h",
"renderer_main_platform_delegate_android.cc",
"renderer_main_platform_delegate_linux.cc",
"renderer_main_platform_delegate_mac.mm",
"renderer_main_platform_delegate_win.cc",
"sad_plugin.cc", "sad_plugin.cc",
"sad_plugin.h", "sad_plugin.h",
"seccomp_sandbox_status_android.cc",
"seccomp_sandbox_status_android.h",
"service_worker/controller_service_worker_connector.cc", "service_worker/controller_service_worker_connector.cc",
"service_worker/controller_service_worker_connector.h", "service_worker/controller_service_worker_connector.h",
"service_worker/embedded_worker_instance_client_impl.cc", "service_worker/embedded_worker_instance_client_impl.cc",
...@@ -231,10 +196,6 @@ target(link_target_type, "renderer") { ...@@ -231,10 +196,6 @@ target(link_target_type, "renderer") {
"stats_collection_controller.h", "stats_collection_controller.h",
"storage_util.cc", "storage_util.cc",
"storage_util.h", "storage_util.h",
"stream_texture_host_android.cc",
"stream_texture_host_android.h",
"theme_helper_mac.h",
"theme_helper_mac.mm",
"top_level_blame_context.cc", "top_level_blame_context.cc",
"top_level_blame_context.h", "top_level_blame_context.h",
"v8_value_converter_impl.cc", "v8_value_converter_impl.cc",
...@@ -259,6 +220,61 @@ target(link_target_type, "renderer") { ...@@ -259,6 +220,61 @@ target(link_target_type, "renderer") {
"worker/worker_thread_registry.h", "worker/worker_thread_registry.h",
] ]
if (is_android) {
sources += [
"java/gin_java_bridge_dispatcher.cc",
"java/gin_java_bridge_dispatcher.h",
"java/gin_java_bridge_object.cc",
"java/gin_java_bridge_object.h",
"java/gin_java_bridge_value_converter.cc",
"java/gin_java_bridge_value_converter.h",
"java/gin_java_function_invocation_helper.cc",
"java/gin_java_function_invocation_helper.h",
"media/android/flinging_renderer_client.cc",
"media/android/flinging_renderer_client.h",
"media/android/flinging_renderer_client_factory.cc",
"media/android/flinging_renderer_client_factory.h",
"media/android/media_player_renderer_client.cc",
"media/android/media_player_renderer_client.h",
"media/android/media_player_renderer_client_factory.cc",
"media/android/media_player_renderer_client_factory.h",
"media/android/stream_texture_factory.cc",
"media/android/stream_texture_factory.h",
"media/android/stream_texture_wrapper_impl.cc",
"media/android/stream_texture_wrapper_impl.h",
"renderer_main_platform_delegate_android.cc",
"seccomp_sandbox_status_android.cc",
"seccomp_sandbox_status_android.h",
"stream_texture_host_android.cc",
"stream_texture_host_android.h",
# Android shares this file with Linux.
"render_view_linux.cc",
]
}
if (is_linux || is_chromeos) {
sources += [
"render_view_linux.cc",
"renderer_main_platform_delegate_linux.cc",
]
}
if (is_mac) {
sources += [
"renderer_main_platform_delegate_mac.mm",
"theme_helper_mac.h",
"theme_helper_mac.mm",
]
}
if (is_win) {
sources += [
"render_view_win.cc",
"renderer_main_platform_delegate_win.cc",
]
}
if (enable_cast_renderer) { if (enable_cast_renderer) {
sources += [ sources += [
"media/cast_renderer_client_factory.cc", "media/cast_renderer_client_factory.cc",
...@@ -376,13 +392,6 @@ target(link_target_type, "renderer") { ...@@ -376,13 +392,6 @@ target(link_target_type, "renderer") {
allow_circular_includes_from = [] allow_circular_includes_from = []
if (is_android) { if (is_android) {
set_sources_assignment_filter([])
sources += [
# Add back the Linux file which Android shares.
"render_view_linux.cc",
]
set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
deps += [ deps += [
# Used by Android WebView only. # Used by Android WebView only.
"//components/viz/service", "//components/viz/service",
...@@ -390,17 +399,6 @@ target(link_target_type, "renderer") { ...@@ -390,17 +399,6 @@ target(link_target_type, "renderer") {
"//third_party/ashmem", "//third_party/ashmem",
"//third_party/libphonenumber", "//third_party/libphonenumber",
] ]
} else {
sources -= [
"java/gin_java_bridge_dispatcher.cc",
"java/gin_java_bridge_dispatcher.h",
"java/gin_java_bridge_object.cc",
"java/gin_java_bridge_object.h",
"java/gin_java_bridge_value_converter.cc",
"java/gin_java_bridge_value_converter.h",
"java/gin_java_function_invocation_helper.cc",
"java/gin_java_function_invocation_helper.h",
]
} }
if (is_linux || is_chromeos) { if (is_linux || is_chromeos) {
......
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