| OLD | NEW |
| 1 { | 1 { |
| 2 'targets': [ | 2 'targets': [ |
| 3 { | 3 { |
| 4 'target_name': 'mojo_system', | 4 'target_name': 'mojo_system', |
| 5 'type': 'static_library', | 5 'type': 'static_library', |
| 6 'defines': [ | 6 'defines': [ |
| 7 'MOJO_SYSTEM_IMPLEMENTATION', | 7 'MOJO_SYSTEM_IMPLEMENTATION', |
| 8 ], | 8 ], |
| 9 'include_dirs': [ | 9 'include_dirs': [ |
| 10 '..', | 10 '..', |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 }, | 100 }, |
| 101 { | 101 { |
| 102 'target_name': 'mojo_public_test_utils', | 102 'target_name': 'mojo_public_test_utils', |
| 103 'type': 'static_library', | 103 'type': 'static_library', |
| 104 'dependencies': [ | 104 'dependencies': [ |
| 105 '../base/base.gyp:base', | 105 '../base/base.gyp:base', |
| 106 '../testing/gtest.gyp:gtest', | 106 '../testing/gtest.gyp:gtest', |
| 107 'mojo_test_support', | 107 'mojo_test_support', |
| 108 ], | 108 ], |
| 109 'sources': [ | 109 'sources': [ |
| 110 'public/cpp/test_support/lib/test_support.cc', |
| 110 'public/cpp/test_support/lib/test_utils.cc', | 111 'public/cpp/test_support/lib/test_utils.cc', |
| 111 'public/cpp/test_support/test_utils.h', | 112 'public/cpp/test_support/test_utils.h', |
| 112 ], | 113 ], |
| 113 }, | 114 }, |
| 114 # TODO(vtl): Reorganize the mojo_public_*_unittests. | 115 # TODO(vtl): Reorganize the mojo_public_*_unittests. |
| 115 { | 116 { |
| 116 'target_name': 'mojo_public_bindings_unittests', | 117 'target_name': 'mojo_public_bindings_unittests', |
| 117 'type': 'executable', | 118 'type': 'executable', |
| 118 'dependencies': [ | 119 'dependencies': [ |
| 119 '../testing/gtest.gyp:gtest', | 120 '../testing/gtest.gyp:gtest', |
| 120 'mojo_bindings', | 121 'mojo_bindings', |
| 121 'mojo_environment_standalone', | 122 'mojo_environment_standalone', |
| 122 'mojo_public_test_utils', | 123 'mojo_public_test_utils', |
| 123 'mojo_run_all_unittests', | 124 'mojo_run_all_unittests', |
| 124 'mojo_public_test_interfaces', | 125 'mojo_public_test_interfaces', |
| 125 'mojo_utility', | 126 'mojo_utility', |
| 126 ], | 127 ], |
| 127 'sources': [ | 128 'sources': [ |
| 128 'public/cpp/bindings/tests/array_unittest.cc', | 129 'public/cpp/bindings/tests/array_unittest.cc', |
| 129 'public/cpp/bindings/tests/buffer_unittest.cc', | 130 'public/cpp/bindings/tests/buffer_unittest.cc', |
| 130 'public/cpp/bindings/tests/connector_unittest.cc', | 131 'public/cpp/bindings/tests/connector_unittest.cc', |
| 131 'public/cpp/bindings/tests/handle_passing_unittest.cc', | 132 'public/cpp/bindings/tests/handle_passing_unittest.cc', |
| 132 'public/cpp/bindings/tests/remote_ptr_unittest.cc', | 133 'public/cpp/bindings/tests/remote_ptr_unittest.cc', |
| 133 'public/cpp/bindings/tests/request_response_unittest.cc', | 134 'public/cpp/bindings/tests/request_response_unittest.cc', |
| 134 'public/cpp/bindings/tests/router_unittest.cc', | 135 'public/cpp/bindings/tests/router_unittest.cc', |
| 135 'public/cpp/bindings/tests/sample_service_unittest.cc', | 136 'public/cpp/bindings/tests/sample_service_unittest.cc', |
| 136 'public/cpp/bindings/tests/type_conversion_unittest.cc', | 137 'public/cpp/bindings/tests/type_conversion_unittest.cc', |
| 138 'public/cpp/bindings/tests/validation_unittest.cc', |
| 137 ], | 139 ], |
| 138 }, | 140 }, |
| 139 { | 141 { |
| 140 'target_name': 'mojo_public_environment_unittests', | 142 'target_name': 'mojo_public_environment_unittests', |
| 141 'type': 'executable', | 143 'type': 'executable', |
| 142 'dependencies': [ | 144 'dependencies': [ |
| 143 '../base/base.gyp:base', | 145 '../base/base.gyp:base', |
| 144 '../testing/gtest.gyp:gtest', | 146 '../testing/gtest.gyp:gtest', |
| 145 'mojo_environment_standalone', | 147 'mojo_environment_standalone', |
| 146 'mojo_public_test_utils', | 148 'mojo_public_test_utils', |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 'public/cpp/bindings/lib/buffer.cc', | 238 'public/cpp/bindings/lib/buffer.cc', |
| 237 'public/cpp/bindings/lib/callback_internal.h', | 239 'public/cpp/bindings/lib/callback_internal.h', |
| 238 'public/cpp/bindings/lib/connector.cc', | 240 'public/cpp/bindings/lib/connector.cc', |
| 239 'public/cpp/bindings/lib/connector.h', | 241 'public/cpp/bindings/lib/connector.h', |
| 240 'public/cpp/bindings/lib/fixed_buffer.cc', | 242 'public/cpp/bindings/lib/fixed_buffer.cc', |
| 241 'public/cpp/bindings/lib/fixed_buffer.h', | 243 'public/cpp/bindings/lib/fixed_buffer.h', |
| 242 'public/cpp/bindings/lib/interface.cc', | 244 'public/cpp/bindings/lib/interface.cc', |
| 243 'public/cpp/bindings/lib/message.cc', | 245 'public/cpp/bindings/lib/message.cc', |
| 244 'public/cpp/bindings/lib/message_builder.cc', | 246 'public/cpp/bindings/lib/message_builder.cc', |
| 245 'public/cpp/bindings/lib/message_builder.h', | 247 'public/cpp/bindings/lib/message_builder.h', |
| 248 'public/cpp/bindings/lib/message_header_validator.cc', |
| 249 'public/cpp/bindings/lib/message_header_validator.h', |
| 246 'public/cpp/bindings/lib/message_internal.h', | 250 'public/cpp/bindings/lib/message_internal.h', |
| 247 'public/cpp/bindings/lib/message_queue.cc', | 251 'public/cpp/bindings/lib/message_queue.cc', |
| 248 'public/cpp/bindings/lib/message_queue.h', | 252 'public/cpp/bindings/lib/message_queue.h', |
| 249 'public/cpp/bindings/lib/router.cc', | 253 'public/cpp/bindings/lib/router.cc', |
| 250 'public/cpp/bindings/lib/router.h', | 254 'public/cpp/bindings/lib/router.h', |
| 251 'public/cpp/bindings/lib/scratch_buffer.cc', | 255 'public/cpp/bindings/lib/scratch_buffer.cc', |
| 252 'public/cpp/bindings/lib/scratch_buffer.h', | 256 'public/cpp/bindings/lib/scratch_buffer.h', |
| 253 'public/cpp/bindings/lib/shared_data.h', | 257 'public/cpp/bindings/lib/shared_data.h', |
| 254 'public/cpp/bindings/lib/shared_ptr.h', | 258 'public/cpp/bindings/lib/shared_ptr.h', |
| 255 'public/cpp/bindings/lib/sync_dispatcher.cc', | 259 'public/cpp/bindings/lib/sync_dispatcher.cc', |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 'type': 'none', | 372 'type': 'none', |
| 369 'variables': { | 373 'variables': { |
| 370 'java_in_dir': 'public/java', | 374 'java_in_dir': 'public/java', |
| 371 }, | 375 }, |
| 372 'includes': [ '../build/java.gypi' ], | 376 'includes': [ '../build/java.gypi' ], |
| 373 }, | 377 }, |
| 374 ], | 378 ], |
| 375 }], | 379 }], |
| 376 ], | 380 ], |
| 377 } | 381 } |
| OLD | NEW |