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

Clean up deprecated sources assignment filter in //mojo

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

Bug: 1018739
Change-Id: I3103d4651d05671a5b795a39cb2c052ae3d7abcb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2443149
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813144}
parent 36aaf5ba
...@@ -12,13 +12,6 @@ if (is_mac) { ...@@ -12,13 +12,6 @@ if (is_mac) {
import("//third_party/protobuf/proto_library.gni") import("//third_party/protobuf/proto_library.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)
component("embedder_internal") { component("embedder_internal") {
output_name = "mojo_core_embedder_internal" output_name = "mojo_core_embedder_internal"
public_deps = [ ":impl_for_embedder" ] public_deps = [ ":impl_for_embedder" ]
...@@ -81,9 +74,7 @@ template("core_impl_source_set") { ...@@ -81,9 +74,7 @@ template("core_impl_source_set") {
sources = [ sources = [
"atomic_flag.h", "atomic_flag.h",
"broker.h", "broker.h",
"broker_win.cc",
"channel.cc", "channel.cc",
"channel_win.cc",
"configuration.cc", "configuration.cc",
"connection_params.cc", "connection_params.cc",
"core.cc", "core.cc",
...@@ -163,6 +154,10 @@ template("core_impl_source_set") { ...@@ -163,6 +154,10 @@ template("core_impl_source_set") {
} }
if (is_win) { if (is_win) {
sources += [
"broker_win.cc",
"channel_win.cc",
]
cflags = [ "/wd4324" ] # Structure was padded due to __declspec(align()), cflags = [ "/wd4324" ] # Structure was padded due to __declspec(align()),
# which is uninteresting. # which is uninteresting.
} }
......
...@@ -4,13 +4,6 @@ ...@@ -4,13 +4,6 @@
import("//third_party/protobuf/proto_library.gni") import("//third_party/protobuf/proto_library.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)
static_library("test_support") { static_library("test_support") {
testonly = true testonly = true
sources = [ sources = [
...@@ -19,7 +12,6 @@ static_library("test_support") { ...@@ -19,7 +12,6 @@ static_library("test_support") {
"mojo_test_base.cc", "mojo_test_base.cc",
"mojo_test_base.h", "mojo_test_base.h",
"test_utils.h", "test_utils.h",
"test_utils_win.cc",
] ]
if (!is_ios) { if (!is_ios) {
...@@ -29,6 +21,10 @@ static_library("test_support") { ...@@ -29,6 +21,10 @@ static_library("test_support") {
] ]
} }
if (is_win) {
sources += [ "test_utils_win.cc" ]
}
if (is_fuchsia || is_posix) { if (is_fuchsia || is_posix) {
sources += [ "test_utils.cc" ] sources += [ "test_utils.cc" ]
} }
......
...@@ -4,13 +4,6 @@ ...@@ -4,13 +4,6 @@
import("//build/config/nacl/config.gni") import("//build/config/nacl/config.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)
component("platform") { component("platform") {
output_name = "mojo_cpp_platform" output_name = "mojo_cpp_platform"
...@@ -22,7 +15,6 @@ component("platform") { ...@@ -22,7 +15,6 @@ component("platform") {
] ]
sources = [ sources = [
"named_platform_channel_win.cc",
"platform_channel.cc", "platform_channel.cc",
"platform_channel_endpoint.cc", "platform_channel_endpoint.cc",
"platform_channel_server_endpoint.cc", "platform_channel_server_endpoint.cc",
...@@ -47,14 +39,16 @@ component("platform") { ...@@ -47,14 +39,16 @@ component("platform") {
sources += [ "named_platform_channel_mac.cc" ] sources += [ "named_platform_channel_mac.cc" ]
} }
if (is_win) {
sources += [ "named_platform_channel_win.cc" ]
}
if (is_fuchsia) { if (is_fuchsia) {
public_deps += [ public_deps += [
"//third_party/fuchsia-sdk/sdk/pkg/fdio", "//third_party/fuchsia-sdk/sdk/pkg/fdio",
"//third_party/fuchsia-sdk/sdk/pkg/zx", "//third_party/fuchsia-sdk/sdk/pkg/zx",
] ]
} } else {
if (!is_fuchsia) {
sources += [ "named_platform_channel.cc" ] sources += [ "named_platform_channel.cc" ]
public += [ "named_platform_channel.h" ] public += [ "named_platform_channel.h" ]
} }
......
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