| 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', | |
| 23 'public/cpp/system/macros.h', | |
| 24 'public/system/core_private.cc', | 22 'public/system/core_private.cc', |
| 25 'public/system/core_private.h', | 23 'public/system/core_private.h', |
| 26 ], | 24 ], |
| 27 'conditions': [ | 25 'conditions': [ |
| 28 ['OS=="mac"', { | 26 ['OS=="mac"', { |
| 29 'xcode_settings': { | 27 'xcode_settings': { |
| 30 # Make it a run-path dependent library. | 28 # Make it a run-path dependent library. |
| 31 'DYLIB_INSTALL_NAME_BASE': '@rpath', | 29 'DYLIB_INSTALL_NAME_BASE': '@rpath', |
| 32 }, | 30 }, |
| 33 'direct_dependent_settings': { | 31 'direct_dependent_settings': { |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 ], | 87 ], |
| 90 'include_dirs': [ | 88 'include_dirs': [ |
| 91 '..', | 89 '..', |
| 92 ], | 90 ], |
| 93 'direct_dependent_settings': { | 91 'direct_dependent_settings': { |
| 94 'include_dirs': [ | 92 'include_dirs': [ |
| 95 '..', | 93 '..', |
| 96 ], | 94 ], |
| 97 }, | 95 }, |
| 98 'sources': [ | 96 'sources': [ |
| 99 'public/tests/test_support.h', | 97 'public/c/test_support/test_support.h', |
| 98 'public/c/test_support/test_support_export.h', |
| 100 'public/tests/test_support_private.cc', | 99 'public/tests/test_support_private.cc', |
| 101 'public/tests/test_support_private.h', | 100 'public/tests/test_support_private.h', |
| 102 'public/tests/test_support_export.h', | |
| 103 ], | 101 ], |
| 104 'conditions': [ | 102 'conditions': [ |
| 105 ['OS=="mac"', { | 103 ['OS=="mac"', { |
| 106 'xcode_settings': { | 104 'xcode_settings': { |
| 107 # Make it a run-path dependent library. | 105 # Make it a run-path dependent library. |
| 108 'DYLIB_INSTALL_NAME_BASE': '@rpath', | 106 'DYLIB_INSTALL_NAME_BASE': '@rpath', |
| 109 }, | 107 }, |
| 110 'direct_dependent_settings': { | 108 'direct_dependent_settings': { |
| 111 'xcode_settings': { | 109 'xcode_settings': { |
| 112 # Look for run-path dependent libraries in the loader's directory. | 110 # Look for run-path dependent libraries in the loader's directory. |
| 113 'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ], | 111 'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ], |
| 114 }, | 112 }, |
| 115 }, | 113 }, |
| 116 }], | 114 }], |
| 117 ], | 115 ], |
| 118 }, | 116 }, |
| 119 { | 117 { |
| 120 'target_name': 'mojo_public_test_utils', | 118 'target_name': 'mojo_public_test_utils', |
| 121 'type': 'static_library', | 119 'type': 'static_library', |
| 122 'dependencies': [ | 120 'dependencies': [ |
| 123 '../base/base.gyp:base', | 121 '../base/base.gyp:base', |
| 124 '../testing/gtest.gyp:gtest', | 122 '../testing/gtest.gyp:gtest', |
| 125 'mojo_system', | 123 'mojo_system', |
| 126 'mojo_test_support', | 124 'mojo_test_support', |
| 127 ], | 125 ], |
| 128 'sources': [ | 126 'sources': [ |
| 129 'public/tests/test_utils.cc', | 127 'public/cpp/test_support/lib/test_utils.cc', |
| 130 'public/tests/test_utils.h', | 128 'public/cpp/test_support/test_utils.h', |
| 131 ], | 129 ], |
| 132 }, | 130 }, |
| 133 # TODO(vtl): Reorganize the mojo_public_*_unittests. | 131 # TODO(vtl): Reorganize the mojo_public_*_unittests. |
| 134 { | 132 { |
| 135 'target_name': 'mojo_public_bindings_unittests', | 133 'target_name': 'mojo_public_bindings_unittests', |
| 136 'type': 'executable', | 134 'type': 'executable', |
| 137 'dependencies': [ | 135 'dependencies': [ |
| 138 '../testing/gtest.gyp:gtest', | 136 '../testing/gtest.gyp:gtest', |
| 139 'mojo_bindings', | 137 'mojo_bindings', |
| 140 'mojo_environment_standalone', | 138 'mojo_environment_standalone', |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 ], | 383 ], |
| 386 'dependencies': [ | 384 'dependencies': [ |
| 387 'mojo_shell_bindings', | 385 'mojo_shell_bindings', |
| 388 ], | 386 ], |
| 389 'export_dependent_settings': [ | 387 'export_dependent_settings': [ |
| 390 'mojo_shell_bindings', | 388 'mojo_shell_bindings', |
| 391 ], | 389 ], |
| 392 }, | 390 }, |
| 393 ], | 391 ], |
| 394 } | 392 } |
| OLD | NEW |