| OLD | NEW |
| 1 { | 1 { |
| 2 'targets': [ | 2 'targets': [ |
| 3 { | 3 { |
| 4 'target_name': 'mojo_system', | 4 'target_name': 'mojo_system', |
| 5 'type': 'shared_library', | 5 'type': 'shared_library', |
| 6 'defines': [ | 6 'defines': [ |
| 7 'MOJO_SYSTEM_IMPLEMENTATION', | 7 'MOJO_SYSTEM_IMPLEMENTATION', |
| 8 ], | 8 ], |
| 9 'include_dirs': [ | 9 'include_dirs': [ |
| 10 '..', | 10 '..', |
| 11 ], | 11 ], |
| 12 'direct_dependent_settings': { | 12 'direct_dependent_settings': { |
| 13 'include_dirs': [ | 13 'include_dirs': [ |
| 14 '..', | 14 '..', |
| 15 ], | 15 ], |
| 16 }, | 16 }, |
| 17 'sources': [ | 17 'sources': [ |
| 18 'public/c/system/async_waiter.h', | 18 'public/c/system/async_waiter.h', |
| 19 'public/c/system/core.h', | 19 'public/c/system/core.h', |
| 20 'public/c/system/macros.h', | 20 'public/c/system/macros.h', |
| 21 'public/c/system/system_export.h', | 21 'public/c/system/system_export.h', |
| 22 'public/system/core_cpp.h', | 22 'public/cpp/system/core.h', |
| 23 'public/system/core_private.cc', | 23 'public/system/core_private.cc', |
| 24 'public/system/core_private.h', | 24 'public/system/core_private.h', |
| 25 ], | 25 ], |
| 26 'conditions': [ | 26 'conditions': [ |
| 27 ['OS=="mac"', { | 27 ['OS=="mac"', { |
| 28 'xcode_settings': { | 28 'xcode_settings': { |
| 29 # Make it a run-path dependent library. | 29 # Make it a run-path dependent library. |
| 30 'DYLIB_INSTALL_NAME_BASE': '@rpath', | 30 'DYLIB_INSTALL_NAME_BASE': '@rpath', |
| 31 }, | 31 }, |
| 32 'direct_dependent_settings': { | 32 'direct_dependent_settings': { |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 '../base/base.gyp:base', | 122 '../base/base.gyp:base', |
| 123 '../testing/gtest.gyp:gtest', | 123 '../testing/gtest.gyp:gtest', |
| 124 'mojo_system', | 124 'mojo_system', |
| 125 'mojo_test_support', | 125 'mojo_test_support', |
| 126 ], | 126 ], |
| 127 'sources': [ | 127 'sources': [ |
| 128 'public/tests/test_utils.cc', | 128 'public/tests/test_utils.cc', |
| 129 'public/tests/test_utils.h', | 129 'public/tests/test_utils.h', |
| 130 ], | 130 ], |
| 131 }, | 131 }, |
| 132 # TODO(vtl): Reorganize the mojo_public_*_unittests. |
| 132 { | 133 { |
| 133 'target_name': 'mojo_public_bindings_unittests', | 134 'target_name': 'mojo_public_bindings_unittests', |
| 134 'type': 'executable', | 135 'type': 'executable', |
| 135 'dependencies': [ | 136 'dependencies': [ |
| 136 '../testing/gtest.gyp:gtest', | 137 '../testing/gtest.gyp:gtest', |
| 137 'mojo_bindings', | 138 'mojo_bindings', |
| 138 'mojo_environment_standalone', | 139 'mojo_environment_standalone', |
| 139 'mojo_public_test_utils', | 140 'mojo_public_test_utils', |
| 140 'mojo_run_all_unittests', | 141 'mojo_run_all_unittests', |
| 141 'mojo_sample_service', | 142 'mojo_sample_service', |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 'type': 'executable', | 184 'type': 'executable', |
| 184 'dependencies': [ | 185 'dependencies': [ |
| 185 '../base/base.gyp:base', | 186 '../base/base.gyp:base', |
| 186 '../testing/gtest.gyp:gtest', | 187 '../testing/gtest.gyp:gtest', |
| 187 'mojo_bindings', | 188 'mojo_bindings', |
| 188 'mojo_public_test_utils', | 189 'mojo_public_test_utils', |
| 189 'mojo_run_all_unittests', | 190 'mojo_run_all_unittests', |
| 190 'mojo_system', | 191 'mojo_system', |
| 191 ], | 192 ], |
| 192 'sources': [ | 193 'sources': [ |
| 193 'public/tests/system/core_cpp_unittest.cc', | 194 'public/c/tests/system/core_unittest.cc', |
| 194 'public/tests/system/core_unittest.cc', | 195 'public/c/tests/system/core_unittest_pure_c.c', |
| 195 'public/tests/system/core_unittest_pure_c.c', | 196 'public/cpp/tests/system/core_unittest.cc', |
| 196 'public/tests/system/macros_unittest.cc', | 197 'public/tests/system/macros_unittest.cc', |
| 197 ], | 198 ], |
| 198 }, | 199 }, |
| 199 { | 200 { |
| 200 'target_name': 'mojo_public_utility_unittests', | 201 'target_name': 'mojo_public_utility_unittests', |
| 201 'type': 'executable', | 202 'type': 'executable', |
| 202 'dependencies': [ | 203 'dependencies': [ |
| 203 '../base/base.gyp:base', | 204 '../base/base.gyp:base', |
| 204 '../testing/gtest.gyp:gtest', | 205 '../testing/gtest.gyp:gtest', |
| 205 'mojo_bindings', | 206 'mojo_bindings', |
| (...skipping 22 matching lines...) Expand all Loading... |
| 228 'type': 'executable', | 229 'type': 'executable', |
| 229 'dependencies': [ | 230 'dependencies': [ |
| 230 '../base/base.gyp:base', | 231 '../base/base.gyp:base', |
| 231 '../testing/gtest.gyp:gtest', | 232 '../testing/gtest.gyp:gtest', |
| 232 'mojo_public_test_utils', | 233 'mojo_public_test_utils', |
| 233 'mojo_run_all_perftests', | 234 'mojo_run_all_perftests', |
| 234 'mojo_system', | 235 'mojo_system', |
| 235 'mojo_utility', | 236 'mojo_utility', |
| 236 ], | 237 ], |
| 237 'sources': [ | 238 'sources': [ |
| 238 'public/tests/system/core_perftest.cc', | 239 'public/c/tests/system/core_perftest.cc', |
| 239 ], | 240 ], |
| 240 }, | 241 }, |
| 241 { | 242 { |
| 242 'target_name': 'mojo_bindings', | 243 'target_name': 'mojo_bindings', |
| 243 'type': 'static_library', | 244 'type': 'static_library', |
| 244 'include_dirs': [ | 245 'include_dirs': [ |
| 245 '..' | 246 '..' |
| 246 ], | 247 ], |
| 247 'sources': [ | 248 'sources': [ |
| 248 'public/bindings/allocation_scope.h', | 249 'public/bindings/allocation_scope.h', |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 ], | 383 ], |
| 383 'dependencies': [ | 384 'dependencies': [ |
| 384 'mojo_shell_bindings', | 385 'mojo_shell_bindings', |
| 385 ], | 386 ], |
| 386 'export_dependent_settings': [ | 387 'export_dependent_settings': [ |
| 387 'mojo_shell_bindings', | 388 'mojo_shell_bindings', |
| 388 ], | 389 ], |
| 389 }, | 390 }, |
| 390 ], | 391 ], |
| 391 } | 392 } |
| OLD | NEW |