Commit 7c75819b authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

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

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

Bug: 1018739
Change-Id: I8f6218da609139d1edb24b56f782bbd0eb12d1eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2445413Reviewed-by: default avatarPeter Beverloo <peter@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813710}
parent a06399d3
...@@ -28,13 +28,6 @@ if (is_android) { ...@@ -28,13 +28,6 @@ if (is_android) {
import("//v8/gni/v8.gni") import("//v8/gni/v8.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)
declare_args() { declare_args() {
content_shell_product_name = "Content Shell" content_shell_product_name = "Content Shell"
content_shell_version = "999.77.34.5" content_shell_version = "999.77.34.5"
...@@ -53,8 +46,11 @@ support_web_tests = !is_android ...@@ -53,8 +46,11 @@ support_web_tests = !is_android
source_set("android_shell_descriptors") { source_set("android_shell_descriptors") {
testonly = true testonly = true
sources = [ "android/shell_descriptors.h" ] sources = []
public_deps = [ "//content/public/common:content_descriptors" ] public_deps = [ "//content/public/common:content_descriptors" ]
if (is_android) {
sources += [ "android/shell_descriptors.h" ]
}
} }
# This component provides a ContentMainDelegate for Content Shell and derived # This component provides a ContentMainDelegate for Content Shell and derived
...@@ -72,14 +68,10 @@ source_set("android_shell_descriptors") { ...@@ -72,14 +68,10 @@ source_set("android_shell_descriptors") {
static_library("content_shell_app") { static_library("content_shell_app") {
testonly = true testonly = true
sources = [ sources = [
"app/paths_mac.h",
"app/paths_mac.mm",
"app/shell_crash_reporter_client.cc", "app/shell_crash_reporter_client.cc",
"app/shell_crash_reporter_client.h", "app/shell_crash_reporter_client.h",
"app/shell_main_delegate.cc", "app/shell_main_delegate.cc",
"app/shell_main_delegate.h", "app/shell_main_delegate.h",
"app/shell_main_delegate_mac.h",
"app/shell_main_delegate_mac.mm",
] ]
deps = [ deps = [
":content_shell_lib", ":content_shell_lib",
...@@ -100,6 +92,14 @@ static_library("content_shell_app") { ...@@ -100,6 +92,14 @@ static_library("content_shell_app") {
"//components/crash/core/app:test_support", "//components/crash/core/app:test_support",
] ]
} }
if (is_mac) {
sources += [
"app/paths_mac.h",
"app/paths_mac.mm",
"app/shell_main_delegate_mac.h",
"app/shell_main_delegate_mac.mm",
]
}
defines = [ defines = [
"CONTENT_SHELL_VERSION=\"$content_shell_version\"", "CONTENT_SHELL_VERSION=\"$content_shell_version\"",
"CONTENT_SHELL_MAJOR_VERSION=\"$content_shell_major_version\"", "CONTENT_SHELL_MAJOR_VERSION=\"$content_shell_major_version\"",
...@@ -109,19 +109,14 @@ static_library("content_shell_app") { ...@@ -109,19 +109,14 @@ static_library("content_shell_app") {
static_library("content_shell_lib") { static_library("content_shell_lib") {
testonly = true testonly = true
sources = [ sources = [
"android/shell_manager.cc",
"android/shell_manager.h",
"browser/renderer_host/shell_render_widget_host_view_mac_delegate.h", "browser/renderer_host/shell_render_widget_host_view_mac_delegate.h",
"browser/renderer_host/shell_render_widget_host_view_mac_delegate.mm", "browser/renderer_host/shell_render_widget_host_view_mac_delegate.mm",
"browser/shell.cc", "browser/shell.cc",
"browser/shell.h", "browser/shell.h",
"browser/shell_application_mac.h",
"browser/shell_application_mac.mm",
"browser/shell_browser_context.cc", "browser/shell_browser_context.cc",
"browser/shell_browser_context.h", "browser/shell_browser_context.h",
"browser/shell_browser_main_parts.cc", "browser/shell_browser_main_parts.cc",
"browser/shell_browser_main_parts.h", "browser/shell_browser_main_parts.h",
"browser/shell_browser_main_parts_mac.mm",
"browser/shell_content_browser_client.cc", "browser/shell_content_browser_client.cc",
"browser/shell_content_browser_client.h", "browser/shell_content_browser_client.h",
"browser/shell_content_index_provider.cc", "browser/shell_content_index_provider.cc",
...@@ -135,26 +130,20 @@ static_library("content_shell_lib") { ...@@ -135,26 +130,20 @@ static_library("content_shell_lib") {
"browser/shell_download_manager_delegate.cc", "browser/shell_download_manager_delegate.cc",
"browser/shell_download_manager_delegate.h", "browser/shell_download_manager_delegate.h",
"browser/shell_javascript_dialog.h", "browser/shell_javascript_dialog.h",
"browser/shell_javascript_dialog_mac.mm",
"browser/shell_javascript_dialog_manager.cc", "browser/shell_javascript_dialog_manager.cc",
"browser/shell_javascript_dialog_manager.h", "browser/shell_javascript_dialog_manager.h",
"browser/shell_javascript_dialog_win.cc",
"browser/shell_permission_manager.cc", "browser/shell_permission_manager.cc",
"browser/shell_permission_manager.h", "browser/shell_permission_manager.h",
"browser/shell_platform_data_aura.cc", "browser/shell_platform_data_aura.cc",
"browser/shell_platform_data_aura.h", "browser/shell_platform_data_aura.h",
"browser/shell_platform_delegate.cc", "browser/shell_platform_delegate.cc",
"browser/shell_platform_delegate.h", "browser/shell_platform_delegate.h",
"browser/shell_platform_delegate_android.cc",
"browser/shell_platform_delegate_mac.mm",
"browser/shell_quota_permission_context.cc", "browser/shell_quota_permission_context.cc",
"browser/shell_quota_permission_context.h", "browser/shell_quota_permission_context.h",
"browser/shell_speech_recognition_manager_delegate.cc", "browser/shell_speech_recognition_manager_delegate.cc",
"browser/shell_speech_recognition_manager_delegate.h", "browser/shell_speech_recognition_manager_delegate.h",
"browser/shell_web_contents_view_delegate.h", "browser/shell_web_contents_view_delegate.h",
"browser/shell_web_contents_view_delegate_android.cc",
"browser/shell_web_contents_view_delegate_creator.h", "browser/shell_web_contents_view_delegate_creator.h",
"browser/shell_web_contents_view_delegate_mac.mm",
"common/power_monitor_test_impl.cc", "common/power_monitor_test_impl.cc",
"common/power_monitor_test_impl.h", "common/power_monitor_test_impl.h",
"common/shell_content_client.cc", "common/shell_content_client.cc",
...@@ -173,6 +162,30 @@ static_library("content_shell_lib") { ...@@ -173,6 +162,30 @@ static_library("content_shell_lib") {
"utility/shell_content_utility_client.h", "utility/shell_content_utility_client.h",
] ]
if (is_android) {
sources += [
"android/shell_manager.cc",
"android/shell_manager.h",
"browser/shell_platform_delegate_android.cc",
"browser/shell_web_contents_view_delegate_android.cc",
]
}
if (is_mac) {
sources += [
"browser/shell_application_mac.h",
"browser/shell_application_mac.mm",
"browser/shell_browser_main_parts_mac.mm",
"browser/shell_javascript_dialog_mac.mm",
"browser/shell_platform_delegate_mac.mm",
"browser/shell_web_contents_view_delegate_mac.mm",
]
}
if (is_win) {
sources += [ "browser/shell_javascript_dialog_win.cc" ]
}
configs += [ configs += [
":content_shell_lib_warnings", ":content_shell_lib_warnings",
"//build/config:precompiled_headers", "//build/config:precompiled_headers",
......
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