| 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/cpp/system/core.h', | 22 'public/cpp/system/core.h', |
| 23 'public/cpp/system/macros.h', |
| 23 'public/system/core_private.cc', | 24 'public/system/core_private.cc', |
| 24 'public/system/core_private.h', | 25 'public/system/core_private.h', |
| 25 ], | 26 ], |
| 26 'conditions': [ | 27 'conditions': [ |
| 27 ['OS=="mac"', { | 28 ['OS=="mac"', { |
| 28 'xcode_settings': { | 29 'xcode_settings': { |
| 29 # Make it a run-path dependent library. | 30 # Make it a run-path dependent library. |
| 30 'DYLIB_INSTALL_NAME_BASE': '@rpath', | 31 'DYLIB_INSTALL_NAME_BASE': '@rpath', |
| 31 }, | 32 }, |
| 32 'direct_dependent_settings': { | 33 'direct_dependent_settings': { |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 '../base/base.gyp:base', | 187 '../base/base.gyp:base', |
| 187 '../testing/gtest.gyp:gtest', | 188 '../testing/gtest.gyp:gtest', |
| 188 'mojo_bindings', | 189 'mojo_bindings', |
| 189 'mojo_public_test_utils', | 190 'mojo_public_test_utils', |
| 190 'mojo_run_all_unittests', | 191 'mojo_run_all_unittests', |
| 191 'mojo_system', | 192 'mojo_system', |
| 192 ], | 193 ], |
| 193 'sources': [ | 194 'sources': [ |
| 194 'public/c/tests/system/core_unittest.cc', | 195 'public/c/tests/system/core_unittest.cc', |
| 195 'public/c/tests/system/core_unittest_pure_c.c', | 196 'public/c/tests/system/core_unittest_pure_c.c', |
| 197 'public/c/tests/system/macros_unittest.cc', |
| 196 'public/cpp/tests/system/core_unittest.cc', | 198 'public/cpp/tests/system/core_unittest.cc', |
| 197 'public/tests/system/macros_unittest.cc', | 199 'public/cpp/tests/system/macros_unittest.cc', |
| 198 ], | 200 ], |
| 199 }, | 201 }, |
| 200 { | 202 { |
| 201 'target_name': 'mojo_public_utility_unittests', | 203 'target_name': 'mojo_public_utility_unittests', |
| 202 'type': 'executable', | 204 'type': 'executable', |
| 203 'dependencies': [ | 205 'dependencies': [ |
| 204 '../base/base.gyp:base', | 206 '../base/base.gyp:base', |
| 205 '../testing/gtest.gyp:gtest', | 207 '../testing/gtest.gyp:gtest', |
| 206 'mojo_bindings', | 208 'mojo_bindings', |
| 207 'mojo_public_test_utils', | 209 'mojo_public_test_utils', |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 ], | 385 ], |
| 384 'dependencies': [ | 386 'dependencies': [ |
| 385 'mojo_shell_bindings', | 387 'mojo_shell_bindings', |
| 386 ], | 388 ], |
| 387 'export_dependent_settings': [ | 389 'export_dependent_settings': [ |
| 388 'mojo_shell_bindings', | 390 'mojo_shell_bindings', |
| 389 ], | 391 ], |
| 390 }, | 392 }, |
| 391 ], | 393 ], |
| 392 } | 394 } |
| OLD | NEW |