| Index: mojo/edk/system/BUILD.gn
|
| diff --git a/mojo/edk/system/BUILD.gn b/mojo/edk/system/BUILD.gn
|
| index 75a097d3d0aa71b52dc40d9034aafc94c0455bff..0b4cb50abb5f5a43e1bcbac855ece46e0f505abf 100644
|
| --- a/mojo/edk/system/BUILD.gn
|
| +++ b/mojo/edk/system/BUILD.gn
|
| @@ -133,26 +133,33 @@ source_set("test_utils") {
|
|
|
| test("mojo_system_unittests") {
|
| sources = [
|
| - "awakable_list_unittest.cc",
|
| - "core_test_base.cc",
|
| - "core_test_base.h",
|
| - "core_unittest.cc",
|
| - "data_pipe_unittest.cc",
|
| - "message_pipe_unittest.cc",
|
| "options_validation_unittest.cc",
|
| - "platform_handle_dispatcher_unittest.cc",
|
| - "shared_buffer_dispatcher_unittest.cc",
|
| - "shared_buffer_unittest.cc",
|
| - "wait_set_dispatcher_unittest.cc",
|
| - "waiter_test_utils.cc",
|
| - "waiter_test_utils.h",
|
| - "waiter_unittest.cc",
|
| ]
|
|
|
| if (!is_ios) {
|
| sources += [ "multiprocess_message_pipe_unittest.cc" ]
|
| }
|
|
|
| + if (!is_android) {
|
| + # TODO(rockot): Re-enable tests on Android once we figure out what's causing
|
| + # them to time out en masse. http://crbug.com/585802
|
| + sources += [
|
| + "awakable_list_unittest.cc",
|
| + "core_test_base.cc",
|
| + "core_test_base.h",
|
| + "core_unittest.cc",
|
| + "data_pipe_unittest.cc",
|
| + "message_pipe_unittest.cc",
|
| + "platform_handle_dispatcher_unittest.cc",
|
| + "shared_buffer_dispatcher_unittest.cc",
|
| + "shared_buffer_unittest.cc",
|
| + "wait_set_dispatcher_unittest.cc",
|
| + "waiter_test_utils.cc",
|
| + "waiter_test_utils.h",
|
| + "waiter_unittest.cc",
|
| + ]
|
| + }
|
| +
|
| deps = [
|
| ":test_utils",
|
| "//base",
|
|
|