Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

Unified Diff: mojo/edk/system/BUILD.gn

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more cleanup Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/edk/system/BUILD.gn
diff --git a/third_party/mojo/src/mojo/edk/system/BUILD.gn b/mojo/edk/system/BUILD.gn
similarity index 59%
copy from third_party/mojo/src/mojo/edk/system/BUILD.gn
copy to mojo/edk/system/BUILD.gn
index ac292d5c4c3bcec98c75e9ff57ec3a0df85073bf..b2df53ab60bf784bafd5ab345b9179b2f15afdd2 100644
--- a/third_party/mojo/src/mojo/edk/system/BUILD.gn
+++ b/mojo/edk/system/BUILD.gn
@@ -4,6 +4,7 @@
import("../mojo_edk.gni")
import("//testing/test.gni")
+import("../../../third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
if (is_android) {
import("//build/config/android/config.gni")
@@ -17,8 +18,19 @@ config("system_config") {
]
}
-component("system") {
- output_name = "mojo_system_impl"
+mojom("master") {
+ sources = [
+ "master.mojom",
+ ]
+}
+
+static_library("system") {
+# TODO(use_chrome_edk): this should be a component to match third_party,
+# but since third_party includes it, we either make it a static library
+# or we have to change the export macros to be different than third_party.
+#component("system") {
+ # TODO(use_chrome_edk): remove "2"
+ output_name = "mojo_system_impl2"
sources = [
"async_waiter.cc",
@@ -26,91 +38,44 @@ component("system") {
"awakable.h",
"awakable_list.cc",
"awakable_list.h",
- "channel.cc",
- "channel.h",
- "channel_endpoint.cc",
- "channel_endpoint.h",
- "channel_endpoint_client.h",
- "channel_endpoint_id.cc",
- "channel_endpoint_id.h",
- "channel_id.h",
- "channel_manager.cc",
- "channel_manager.h",
"configuration.cc",
"configuration.h",
- "connection_identifier.h",
- "connection_manager.cc",
- "connection_manager.h",
- "connection_manager_messages.h",
"core.cc",
"core.h",
"data_pipe.cc",
"data_pipe.h",
"data_pipe_consumer_dispatcher.cc",
"data_pipe_consumer_dispatcher.h",
- "data_pipe_impl.cc",
- "data_pipe_impl.h",
"data_pipe_producer_dispatcher.cc",
"data_pipe_producer_dispatcher.h",
"dispatcher.cc",
"dispatcher.h",
- "endpoint_relayer.cc",
- "endpoint_relayer.h",
"handle_signals_state.h",
"handle_table.cc",
"handle_table.h",
- "incoming_endpoint.cc",
- "incoming_endpoint.h",
- "ipc_support.cc",
- "ipc_support.h",
- "local_data_pipe_impl.cc",
- "local_data_pipe_impl.h",
- "local_message_pipe_endpoint.cc",
- "local_message_pipe_endpoint.h",
"mapping_table.cc",
"mapping_table.h",
- "master_connection_manager.cc",
- "master_connection_manager.h",
- "memory.cc",
- "memory.h",
+ "master_impl.cc",
+ "master_impl.h",
"message_in_transit.cc",
"message_in_transit.h",
"message_in_transit_queue.cc",
"message_in_transit_queue.h",
- "message_pipe.cc",
- "message_pipe.h",
"message_pipe_dispatcher.cc",
"message_pipe_dispatcher.h",
- "message_pipe_endpoint.cc",
- "message_pipe_endpoint.h",
- "mutex.cc",
- "mutex.h",
"options_validation.h",
"platform_handle_dispatcher.cc",
"platform_handle_dispatcher.h",
- "process_identifier.h",
- "proxy_message_pipe_endpoint.cc",
- "proxy_message_pipe_endpoint.h",
"raw_channel.cc",
"raw_channel.h",
"raw_channel_posix.cc",
"raw_channel_win.cc",
- "remote_consumer_data_pipe_impl.cc",
- "remote_consumer_data_pipe_impl.h",
- "remote_data_pipe_ack.h",
- "remote_producer_data_pipe_impl.cc",
- "remote_producer_data_pipe_impl.h",
"shared_buffer_dispatcher.cc",
"shared_buffer_dispatcher.h",
"simple_dispatcher.cc",
"simple_dispatcher.h",
- "slave_connection_manager.cc",
- "slave_connection_manager.h",
- "thread_annotations.h",
"transport_data.cc",
"transport_data.h",
- "unique_identifier.cc",
- "unique_identifier.h",
"waiter.cc",
"waiter.h",
]
@@ -126,23 +91,30 @@ component("system") {
"../embedder",
"../embedder:delegates",
"../embedder:platform",
- "../../public/c/system",
- "../../public/cpp/system",
+ "../../../third_party/mojo/src/mojo/public/c/system",
+ "../../../third_party/mojo/src/mojo/public/cpp/system",
]
deps = [
"//base",
"//base/third_party/dynamic_annotations",
+ ":master",
]
+ if (is_win) {
+ cflags = [ "/wd4324" ] # Structure was padded due to __declspec(align()),
+ # which is uninteresting.
+ }
+
allow_circular_includes_from = [ "../embedder" ]
}
group("tests") {
testonly = true
deps = [
- ":mojo_system_unittests",
- ":mojo_message_pipe_perftests",
+ # TODO(use_chrome_edk): remove "2"
+ ":mojo_system_unittests2",
+ ":mojo_message_pipe_perftests2",
]
}
@@ -154,58 +126,45 @@ mojo_edk_source_set("test_utils") {
"test_utils.h",
]
- mojo_sdk_public_deps = [
- "mojo/public/c/system",
- "mojo/public/cpp/system",
+ public_deps = [
+ "//third_party/mojo/src/mojo/public/c/system",
+ "//third_party/mojo/src/mojo/public/cpp/system",
]
deps = [
"//base",
"//base/test:test_support",
+ "//mojo/edk/test:test_support",
+ "//testing/gtest:gtest",
]
}
-test("mojo_system_unittests") {
+# TODO(use_chrome_edk): remove "2"
+test("mojo_system_unittests2") {
sources = [
"../test/multiprocess_test_helper_unittest.cc",
"awakable_list_unittest.cc",
- "channel_endpoint_id_unittest.cc",
- "channel_endpoint_unittest.cc",
- "channel_manager_unittest.cc",
- "channel_test_base.cc",
- "channel_test_base.h",
- "channel_unittest.cc",
- "connection_manager_unittest.cc",
"core_test_base.cc",
"core_test_base.h",
"core_unittest.cc",
- "data_pipe_impl_unittest.cc",
"data_pipe_unittest.cc",
"dispatcher_unittest.cc",
- "endpoint_relayer_unittest.cc",
- "ipc_support_unittest.cc",
- "memory_unittest.cc",
+ "master_impl_unittest.cc",
+
"message_in_transit_queue_unittest.cc",
"message_in_transit_test_utils.cc",
"message_in_transit_test_utils.h",
- "message_pipe_dispatcher_unittest.cc",
"message_pipe_test_utils.cc",
"message_pipe_test_utils.h",
"message_pipe_unittest.cc",
"multiprocess_message_pipe_unittest.cc",
- "mutex_unittest.cc",
"options_validation_unittest.cc",
"platform_handle_dispatcher_unittest.cc",
+
"raw_channel_unittest.cc",
- "remote_data_pipe_impl_unittest.cc",
- "remote_message_pipe_unittest.cc",
"run_all_unittests.cc",
"shared_buffer_dispatcher_unittest.cc",
"simple_dispatcher_unittest.cc",
- "test_channel_endpoint_client.cc",
- "test_channel_endpoint_client.h",
- "thread_annotations_unittest.cc",
- "unique_identifier_unittest.cc",
"waiter_test_utils.cc",
"waiter_test_utils.h",
"waiter_unittest.cc",
@@ -214,17 +173,22 @@ test("mojo_system_unittests") {
deps = [
":system",
":test_utils",
- "../embedder:embedder_unittests",
+
+ # TODO(use_chrome_edk): remove "2"
+ "../embedder:embedder_unittests2",
+ "../../../third_party/mojo/src/mojo/public/cpp/environment:standalone",
"../test:test_support",
"//base",
"//base/test:test_support",
"//testing/gtest",
]
- allow_circular_includes_from = [ "../embedder:embedder_unittests" ]
+ # TODO(use_chrome_edk): remove "2"
+ allow_circular_includes_from = [ "../embedder:embedder_unittests2" ]
}
-test("mojo_message_pipe_perftests") {
+# TODO(use_chrome_edk): remove "2"
+test("mojo_message_pipe_perftests2") {
sources = [
"message_pipe_perftest.cc",
"message_pipe_test_utils.cc",
@@ -235,9 +199,10 @@ test("mojo_message_pipe_perftests") {
":system",
":test_utils",
"../test:test_support",
+ "../test:run_all_perftests",
+ "../../../third_party/mojo/src/mojo/public/cpp/environment:standalone",
"//base",
"//base/test:test_support",
- "//base/test:test_support_perf",
"//testing/gtest",
]
}
« no previous file with comments | « mojo/edk/mojo_edk.gni ('k') | mojo/edk/system/async_waiter.h » ('j') | mojo/edk/system/core.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698