},
'sources': [
'public/gles2/gles2.h',
+ 'public/gles2/gles2_export.h',
'public/gles2/gles2_private.cc',
'public/gles2/gles2_private.h',
- 'public/gles2/gles2_export.h',
],
},
{
- 'target_name': 'mojo_public_test_support',
+ 'target_name': 'mojo_test_support',
+ 'type': 'shared_library',
+ 'defines': [
+ 'MOJO_TEST_SUPPORT_IMPLEMENTATION',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '..',
+ ],
+ },
+ 'sources': [
+ 'public/tests/test_support.h',
+ 'public/tests/test_support_private.cc',
+ 'public/tests/test_support_private.h',
+ 'public/tests/test_support_export.h',
+ ],
+ },
+ {
+ 'target_name': 'mojo_public_test_utils',
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
'mojo_system',
+ 'mojo_test_support',
],
'sources': [
- 'public/tests/test_support.cc',
- 'public/tests/test_support.h',
+ 'public/tests/test_utils.cc',
+ 'public/tests/test_utils.h',
],
},
{
'../testing/gtest.gyp:gtest',
'mojo_bindings',
'mojo_environment_standalone',
- 'mojo_public_test_support',
+ 'mojo_public_test_utils',
'mojo_run_all_unittests',
'mojo_sample_service',
'mojo_system',
'mojo_utility',
],
'sources': [
- 'public/tests/bindings/array_unittest.cc',
- 'public/tests/bindings/connector_unittest.cc',
- 'public/tests/bindings/handle_passing_unittest.cc',
- 'public/tests/bindings/remote_ptr_unittest.cc',
- 'public/tests/bindings/type_conversion_unittest.cc',
- 'public/tests/bindings/buffer_unittest.cc',
- 'public/tests/bindings/math_calculator.mojom',
- 'public/tests/bindings/sample_factory.mojom',
- 'public/tests/bindings/sample_service_unittest.cc',
- 'public/tests/bindings/test_structs.mojom',
+ 'public/bindings/tests/array_unittest.cc',
+ 'public/bindings/tests/connector_unittest.cc',
+ 'public/bindings/tests/handle_passing_unittest.cc',
+ 'public/bindings/tests/remote_ptr_unittest.cc',
+ 'public/bindings/tests/type_conversion_unittest.cc',
+ 'public/bindings/tests/buffer_unittest.cc',
+ 'public/bindings/tests/math_calculator.mojom',
+ 'public/bindings/tests/sample_factory.mojom',
+ 'public/bindings/tests/sample_service_unittest.cc',
+ 'public/bindings/tests/test_structs.mojom',
],
'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
},
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
'mojo_environment_standalone',
- 'mojo_public_test_support',
+ 'mojo_public_test_utils',
'mojo_run_all_unittests',
'mojo_system',
'mojo_utility',
],
'sources': [
- 'public/tests/environment/async_waiter_unittest.cc',
+ 'public/environment/tests/async_waiter_unittest.cc',
],
},
{
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
'mojo_bindings',
- 'mojo_public_test_support',
+ 'mojo_public_test_utils',
'mojo_run_all_unittests',
'mojo_system',
],
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
'mojo_bindings',
- 'mojo_public_test_support',
+ 'mojo_public_test_utils',
'mojo_run_all_unittests',
'mojo_system',
'mojo_utility',
],
'sources': [
- 'public/tests/utility/run_loop_unittest.cc',
- 'public/tests/utility/thread_local_unittest.cc',
+ 'public/utility/tests/mutex_unittest.cc',
+ 'public/utility/tests/run_loop_unittest.cc',
+ 'public/utility/tests/thread_unittest.cc',
+ ],
+ 'conditions': [
+ # See crbug.com/342893:
+ ['OS=="win"', {
+ 'sources!': [
+ 'public/utility/tests/mutex_unittest.cc',
+ 'public/utility/tests/thread_unittest.cc',
+ ],
+ }],
],
},
{
'dependencies': [
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
- 'mojo_public_test_support',
+ 'mojo_public_test_utils',
'mojo_run_all_perftests',
'mojo_system',
+ 'mojo_utility',
],
'sources': [
'public/tests/system/core_perftest.cc',
'..'
],
'sources': [
+ 'public/bindings/allocation_scope.h',
+ 'public/bindings/array.h',
+ 'public/bindings/buffer.h',
+ 'public/bindings/error_handler.h',
+ 'public/bindings/interface.h',
+ 'public/bindings/message.h',
+ 'public/bindings/passable.h',
+ 'public/bindings/remote_ptr.h',
+ 'public/bindings/sync_dispatcher.h',
+ 'public/bindings/type_converter.h',
'public/bindings/lib/array.cc',
- 'public/bindings/lib/array.h',
'public/bindings/lib/array_internal.h',
'public/bindings/lib/array_internal.cc',
- 'public/bindings/lib/bindings.h',
'public/bindings/lib/bindings_internal.h',
'public/bindings/lib/bindings_serialization.cc',
'public/bindings/lib/bindings_serialization.h',
'public/bindings/lib/buffer.cc',
- 'public/bindings/lib/buffer.h',
'public/bindings/lib/connector.cc',
'public/bindings/lib/connector.h',
+ 'public/bindings/lib/fixed_buffer.cc',
+ 'public/bindings/lib/fixed_buffer.h',
+ 'public/bindings/lib/interface.cc',
'public/bindings/lib/message.cc',
- 'public/bindings/lib/message.h',
'public/bindings/lib/message_builder.cc',
'public/bindings/lib/message_builder.h',
'public/bindings/lib/message_queue.cc',
'public/bindings/lib/message_queue.h',
+ 'public/bindings/lib/scratch_buffer.cc',
+ 'public/bindings/lib/scratch_buffer.h',
+ 'public/bindings/lib/sync_dispatcher.cc',
],
},
{
'target_name': 'mojo_sample_service',
'type': 'static_library',
'sources': [
- 'public/tests/bindings/sample_service.mojom',
+ 'public/bindings/tests/sample_service.mojom',
+ 'public/bindings/tests/sample_import.mojom',
+ 'public/bindings/tests/sample_import2.mojom',
],
'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
'target_name': 'mojo_environment_standalone',
'type': 'static_library',
'sources': [
- 'public/environment/default_async_waiter.h',
'public/environment/buffer_tls.h',
+ 'public/environment/default_async_waiter.h',
'public/environment/environment.h',
- 'public/environment/standalone/default_async_waiter.cc',
- 'public/environment/standalone/buffer_tls.cc',
- 'public/environment/standalone/buffer_tls_setup.h',
- 'public/environment/standalone/environment.cc',
+ 'public/environment/lib/default_async_waiter.cc',
+ 'public/environment/lib/buffer_tls.cc',
+ 'public/environment/lib/buffer_tls_setup.h',
+ 'public/environment/lib/environment.cc',
],
'include_dirs': [
'..',
'target_name': 'mojo_utility',
'type': 'static_library',
'sources': [
- 'public/utility/run_loop.cc',
+ 'public/utility/mutex.h',
'public/utility/run_loop.h',
'public/utility/run_loop_handler.h',
- 'public/utility/thread_local.h',
- 'public/utility/thread_local_posix.cc',
- 'public/utility/thread_local_win.cc',
+ 'public/utility/thread.h',
+ 'public/utility/lib/mutex.cc',
+ 'public/utility/lib/run_loop.cc',
+ 'public/utility/lib/thread.cc',
+ 'public/utility/lib/thread_local.h',
+ 'public/utility/lib/thread_local_posix.cc',
+ 'public/utility/lib/thread_local_win.cc',
+ ],
+ 'conditions': [
+ # See crbug.com/342893:
+ ['OS=="win"', {
+ 'sources!': [
+ 'public/utility/mutex.h',
+ 'public/utility/thread.h',
+ 'public/utility/lib/mutex.cc',
+ 'public/utility/lib/thread.cc',
+ ],
+ }],
],
'include_dirs': [
'..',
],
},
+ {
+ 'target_name': 'mojo_shell_bindings',
+ 'type': 'static_library',
+ 'sources': [
+ 'public/shell/lib/application.cc',
+ 'public/shell/lib/shell.mojom',
+ 'public/shell/lib/service.cc',
+ 'public/shell/application.h',
+ 'public/shell/service.h',
+ ],
+ 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
+ 'export_dependent_settings': [
+ 'mojo_bindings',
+ 'mojo_system',
+ ],
+ },
],
}