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

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

Issue 782693004: Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hack mojo_system_impl gypi for android :| Created 6 years 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/mojo/edk/system/BUILD.gn b/mojo/edk/system/BUILD.gn
index 8cc8905c4b1d3dc65c908b102c6b8c4ae02111e6..8d24a08844af364a8c5022e8443da238f9110283 100644
--- a/mojo/edk/system/BUILD.gn
+++ b/mojo/edk/system/BUILD.gn
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("../mojo_edk.gni")
+
if (is_android) {
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
@@ -18,6 +20,9 @@ component("system") {
output_name = "mojo_system_impl"
sources = [
+ "awakable.h",
+ "awakable_list.cc",
+ "awakable_list.h",
"channel.cc",
"channel.h",
"channel_endpoint.cc",
@@ -41,6 +46,8 @@ component("system") {
"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",
@@ -79,8 +86,6 @@ component("system") {
"transport_data.h",
"waiter.cc",
"waiter.h",
- "waiter_list.cc",
- "waiter_list.h",
]
defines = [
@@ -91,9 +96,9 @@ component("system") {
all_dependent_configs = [ ":system_config" ]
public_deps = [
- "//mojo/edk/embedder",
- "//mojo/edk/embedder:platform",
- "//mojo/public/c/system",
+ "../embedder",
+ "../embedder:platform",
+ "../../public/c/system",
]
deps = [
@@ -101,13 +106,28 @@ component("system") {
"//base/third_party/dynamic_annotations",
]
- allow_circular_includes_from = [ "//mojo/edk/embedder" ]
+ allow_circular_includes_from = [ "../embedder" ]
+}
+
+mojo_edk_source_set("test_utils") {
+ testonly = true
+
+ sources = [
+ "test_utils.cc",
+ "test_utils.h",
+ ]
+
+ deps = [
+ "//base",
+ "//base/test:test_support",
+ ]
}
# GYP version: mojo/edk/mojo_edk.gyp:mojo_system_unittests
test("mojo_system_unittests") {
sources = [
"../test/multiprocess_test_helper_unittest.cc",
+ "awakable_list_unittest.cc",
"channel_endpoint_id_unittest.cc",
"channel_manager_unittest.cc",
"channel_unittest.cc",
@@ -130,11 +150,6 @@ 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",
"waiter_test_utils.cc",
"waiter_test_utils.h",
"waiter_unittest.cc",
@@ -142,10 +157,11 @@ test("mojo_system_unittests") {
deps = [
":system",
+ ":test_utils",
+ "../embedder:embedder_unittests",
+ "../test:test_support",
"//base",
"//base/test:test_support",
- "//mojo/edk/embedder:embedder_unittests",
- "//mojo/edk/test:test_support",
"//testing/gtest",
]
@@ -153,7 +169,7 @@ test("mojo_system_unittests") {
deps += [ "//testing/android:native_test_native_code" ]
}
- allow_circular_includes_from = [ "//mojo/edk/embedder:embedder_unittests" ]
+ allow_circular_includes_from = [ "../embedder:embedder_unittests" ]
}
# GYP version: mojo/edk/mojo_edk.gyp:mojo_message_pipe_perftests
@@ -162,16 +178,15 @@ test("mojo_message_pipe_perftests") {
"message_pipe_perftest.cc",
"message_pipe_test_utils.h",
"message_pipe_test_utils.cc",
- "test_utils.cc",
- "test_utils.h",
]
deps = [
":system",
+ ":test_utils",
+ "../test:test_support",
"//base",
"//base/test:test_support",
"//base/test:test_support_perf",
- "//mojo/edk/test:test_support",
"//testing/gtest",
]
}

Powered by Google App Engine
This is Rietveld 408576698