Chromium Code Reviews| Index: mojo/mojo.gyp |
| diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp |
| index 2cd3d5c82f1f006bab37f9b061ee40b023e1bb12..567452f54381fc2bc68bb161b229884f365595df 100644 |
| --- a/mojo/mojo.gyp |
| +++ b/mojo/mojo.gyp |
| @@ -4,7 +4,7 @@ |
| { |
| 'variables': { |
| - 'chromium_code': 1, # Use higher warning level. |
| + 'chromium_code': 1, |
| }, |
| 'target_defaults': { |
| 'defines': ['MOJO_IMPLEMENTATION'], |
| @@ -13,6 +13,110 @@ |
| { |
| 'target_name': 'mojo', |
| 'type': 'none', |
| + 'dependencies': [ |
| + 'mojo_public_test_support', |
| + 'mojo_public_unittests', |
| + 'mojo_public_perftests', |
| + 'mojo_system', |
| + 'mojo_system_unittests', |
| + ], |
| + }, |
| + { |
| + 'target_name': 'mojo_public_test_support', |
| + 'type': 'static_library', |
| + 'dependencies': [ |
| + '../base/base.gyp:base', |
| + '../testing/gtest.gyp:gtest', |
| + 'mojo_system', |
| + ], |
| + 'sources': [ |
| + 'public/tests/test_support.cc', |
| + 'public/tests/test_support.h', |
| + ], |
| + }, |
| + { |
| + 'target_name': 'mojo_public_unittests', |
| + 'type': 'executable', |
| + 'dependencies': [ |
| + '../base/base.gyp:run_all_unittests', |
| + '../testing/gtest.gyp:gtest', |
| + 'mojo_public_test_support', |
| + 'mojo_system', |
| + ], |
| + 'sources': [ |
| + 'public/tests/system_core_unittest.cc', |
| + ], |
| + }, |
| + { |
| + 'target_name': 'mojo_public_perftests', |
| + 'type': 'executable', |
| + 'dependencies': [ |
| + '../base/base.gyp:base', |
| + '../base/base.gyp:test_support_perf', |
| + '../testing/gtest.gyp:gtest', |
| + 'mojo_public_test_support', |
| + 'mojo_system', |
| + ], |
| + 'sources': [ |
| + 'public/tests/system_core_perftest.cc', |
| + ], |
| + }, |
| + { |
| + 'target_name': 'mojo_system', |
| + # TODO(vtl): This should probably be '<(component)'; make it work. |
|
tfarina
2013/10/01 02:21:13
shouldn't be hard.
Add:
defines: [ 'MOJO_IMPLEMEN
|
| + 'type': 'static_library', |
| + 'dependencies': [ |
| + '../base/base.gyp:base', |
| + ], |
| + 'sources': [ |
| + 'public/system/core.h', |
| + 'system/core.cc', |
| + 'system/core_impl.cc', |
| + 'system/core_impl.h', |
| + 'system/dispatcher.cc', |
| + 'system/dispatcher.h', |
| + 'system/limits.h', |
| + 'system/memory.cc', |
| + 'system/memory.h', |
| + 'system/message_pipe.cc', |
| + 'system/message_pipe.h', |
| + 'system/message_pipe_dispatcher.cc', |
| + 'system/message_pipe_dispatcher.h', |
| + 'system/simple_dispatcher.cc', |
| + 'system/simple_dispatcher.h', |
| + 'system/waiter.cc', |
| + 'system/waiter.h', |
| + 'system/waiter_list.cc', |
| + 'system/waiter_list.h', |
| + ], |
| + 'direct_dependent_settings': { |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + }, |
| + }, |
| + { |
| + 'target_name': 'mojo_system_unittests', |
| + 'type': 'executable', |
| + 'dependencies': [ |
| + '../base/base.gyp:run_all_unittests', |
| + '../testing/gtest.gyp:gtest', |
| + 'mojo_system', |
| + ], |
| + 'sources': [ |
| + 'system/core_impl_unittest.cc', |
| + 'system/core_test_base.cc', |
| + 'system/core_test_base.h', |
| + 'system/dispatcher_unittest.cc', |
| + 'system/message_pipe_dispatcher_unittest.cc', |
| + 'system/message_pipe_unittest.cc', |
| + 'system/simple_dispatcher_unittest.cc', |
| + 'system/test_utils.h', |
| + 'system/waiter_list_unittest.cc', |
| + 'system/waiter_test_utils.cc', |
| + 'system/waiter_test_utils.h', |
| + 'system/waiter_unittest.cc', |
| + ], |
| }, |
| ], |
| } |