| Index: mojo/edk/system/BUILD.gn
|
| diff --git a/mojo/edk/system/BUILD.gn b/mojo/edk/system/BUILD.gn
|
| index 791a192c48780008a0bed913b7eadddae705a3c0..d0bfda78875e957f52691f703b87addde39269f7 100644
|
| --- a/mojo/edk/system/BUILD.gn
|
| +++ b/mojo/edk/system/BUILD.gn
|
| @@ -12,19 +12,6 @@ config("system_config") {
|
| component("system") {
|
| output_name = "mojo_system_impl"
|
|
|
| - deps = [
|
| - "//base",
|
| - "//base/third_party/dynamic_annotations",
|
| - "//mojo/edk/embedder",
|
| - ]
|
| -
|
| - defines = [
|
| - "MOJO_SYSTEM_IMPL_IMPLEMENTATION",
|
| - "MOJO_SYSTEM_IMPLEMENTATION",
|
| - ]
|
| -
|
| - all_dependent_configs = [ ":system_config" ]
|
| -
|
| sources = [
|
| "channel.cc",
|
| "channel.h",
|
| @@ -34,7 +21,10 @@ component("system") {
|
| "channel_endpoint_id.h",
|
| "channel_info.cc",
|
| "channel_info.h",
|
| - "constants.h",
|
| + "channel_manager.cc",
|
| + "channel_manager.h",
|
| + "configuration.cc",
|
| + "configuration.h",
|
| "core.cc",
|
| "core.h",
|
| "data_pipe.cc",
|
| @@ -45,7 +35,6 @@ component("system") {
|
| "data_pipe_producer_dispatcher.h",
|
| "dispatcher.cc",
|
| "dispatcher.h",
|
| - "entrypoints.cc",
|
| "handle_signals_state.h",
|
| "handle_table.cc",
|
| "handle_table.h",
|
| @@ -87,18 +76,30 @@ component("system") {
|
| "waiter_list.cc",
|
| "waiter_list.h",
|
| ]
|
| -}
|
|
|
| -# GYP version: mojo/edk/mojo_edk.gyp:mojo_system_unittests
|
| -test("mojo_system_unittests") {
|
| + defines = [
|
| + "MOJO_SYSTEM_IMPL_IMPLEMENTATION",
|
| + "MOJO_SYSTEM_IMPLEMENTATION",
|
| + ]
|
| +
|
| + all_dependent_configs = [ ":system_config" ]
|
| +
|
| + public_deps = [
|
| + "//mojo/edk/embedder",
|
| + "//mojo/edk/embedder:platform",
|
| + "//mojo/public/c/system",
|
| + ]
|
| +
|
| deps = [
|
| - ":system",
|
| "//base",
|
| - "//mojo/edk/embedder:embedder_unittests",
|
| - "//mojo/edk/test:test_support",
|
| - "//testing/gtest",
|
| + "//base/third_party/dynamic_annotations",
|
| ]
|
|
|
| + allow_circular_includes_from = [ "//mojo/edk/embedder" ]
|
| +}
|
| +
|
| +# GYP version: mojo/edk/mojo_edk.gyp:mojo_system_unittests
|
| +test("mojo_system_unittests") {
|
| sources = [
|
| "../test/multiprocess_test_helper_unittest.cc",
|
| "channel_endpoint_id_unittest.cc",
|
| @@ -122,6 +123,7 @@ test("mojo_system_unittests") {
|
| "run_all_unittests.cc",
|
| "shared_buffer_dispatcher_unittest.cc",
|
| "simple_dispatcher_unittest.cc",
|
| + # TODO(vtl): Factor test_utils.* into their own source set.
|
| "test_utils.cc",
|
| "test_utils.h",
|
| "waiter_list_unittest.cc",
|
| @@ -129,19 +131,21 @@ test("mojo_system_unittests") {
|
| "waiter_test_utils.h",
|
| "waiter_unittest.cc",
|
| ]
|
| -}
|
|
|
| -# GYP version: mojo/edk/mojo_edk.gyp:mojo_message_pipe_perftests
|
| -test("mojo_message_pipe_perftests") {
|
| deps = [
|
| ":system",
|
| "//base",
|
| "//base/test:test_support",
|
| - "//base/test:test_support_perf",
|
| + "//mojo/edk/embedder:embedder_unittests",
|
| "//mojo/edk/test:test_support",
|
| "//testing/gtest",
|
| ]
|
|
|
| + allow_circular_includes_from = [ "//mojo/edk/embedder:embedder_unittests" ]
|
| +}
|
| +
|
| +# GYP version: mojo/edk/mojo_edk.gyp:mojo_message_pipe_perftests
|
| +test("mojo_message_pipe_perftests") {
|
| sources = [
|
| "message_pipe_perftest.cc",
|
| "message_pipe_test_utils.h",
|
| @@ -149,4 +153,13 @@ test("mojo_message_pipe_perftests") {
|
| "test_utils.cc",
|
| "test_utils.h",
|
| ]
|
| +
|
| + deps = [
|
| + ":system",
|
| + "//base",
|
| + "//base/test:test_support",
|
| + "//base/test:test_support_perf",
|
| + "//mojo/edk/test:test_support",
|
| + "//testing/gtest",
|
| + ]
|
| }
|
|
|