| 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 '..', |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 ], | 46 ], |
| 47 }, | 47 }, |
| 48 'sources': [ | 48 'sources': [ |
| 49 'public/gles2/gles2.h', | 49 'public/gles2/gles2.h', |
| 50 'public/gles2/gles2_private.cc', | 50 'public/gles2/gles2_private.cc', |
| 51 'public/gles2/gles2_private.h', | 51 'public/gles2/gles2_private.h', |
| 52 'public/gles2/gles2_export.h', | 52 'public/gles2/gles2_export.h', |
| 53 ], | 53 ], |
| 54 }, | 54 }, |
| 55 { | 55 { |
| 56 'target_name': 'mojo_public_test_support', | 56 'target_name': 'mojo_public_test_utils', |
| 57 'type': 'static_library', | 57 'type': 'static_library', |
| 58 'dependencies': [ | 58 'dependencies': [ |
| 59 '../base/base.gyp:base', | 59 '../base/base.gyp:base', |
| 60 '../testing/gtest.gyp:gtest', | 60 '../testing/gtest.gyp:gtest', |
| 61 'mojo_system', | 61 'mojo_system', |
| 62 ], | 62 ], |
| 63 'sources': [ | 63 'sources': [ |
| 64 'public/tests/test_support.cc', | 64 'public/tests/test_utils.cc', |
| 65 'public/tests/test_support.h', | 65 'public/tests/test_utils.h', |
| 66 ], | 66 ], |
| 67 }, | 67 }, |
| 68 { | 68 { |
| 69 'target_name': 'mojo_public_bindings_unittests', | 69 'target_name': 'mojo_public_bindings_unittests', |
| 70 'type': 'executable', | 70 'type': 'executable', |
| 71 'dependencies': [ | 71 'dependencies': [ |
| 72 '../testing/gtest.gyp:gtest', | 72 '../testing/gtest.gyp:gtest', |
| 73 'mojo_bindings', | 73 'mojo_bindings', |
| 74 'mojo_environment_standalone', | 74 'mojo_environment_standalone', |
| 75 'mojo_public_test_support', | 75 'mojo_public_test_utils', |
| 76 'mojo_run_all_unittests', | 76 'mojo_run_all_unittests', |
| 77 'mojo_sample_service', | 77 'mojo_sample_service', |
| 78 'mojo_system', | 78 'mojo_system', |
| 79 'mojo_utility', | 79 'mojo_utility', |
| 80 ], | 80 ], |
| 81 'sources': [ | 81 'sources': [ |
| 82 'public/bindings/tests/array_unittest.cc', | 82 'public/bindings/tests/array_unittest.cc', |
| 83 'public/bindings/tests/connector_unittest.cc', | 83 'public/bindings/tests/connector_unittest.cc', |
| 84 'public/bindings/tests/handle_passing_unittest.cc', | 84 'public/bindings/tests/handle_passing_unittest.cc', |
| 85 'public/bindings/tests/remote_ptr_unittest.cc', | 85 'public/bindings/tests/remote_ptr_unittest.cc', |
| 86 'public/bindings/tests/type_conversion_unittest.cc', | 86 'public/bindings/tests/type_conversion_unittest.cc', |
| 87 'public/bindings/tests/buffer_unittest.cc', | 87 'public/bindings/tests/buffer_unittest.cc', |
| 88 'public/bindings/tests/math_calculator.mojom', | 88 'public/bindings/tests/math_calculator.mojom', |
| 89 'public/bindings/tests/sample_factory.mojom', | 89 'public/bindings/tests/sample_factory.mojom', |
| 90 'public/bindings/tests/sample_service_unittest.cc', | 90 'public/bindings/tests/sample_service_unittest.cc', |
| 91 'public/bindings/tests/test_structs.mojom', | 91 'public/bindings/tests/test_structs.mojom', |
| 92 ], | 92 ], |
| 93 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ], | 93 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ], |
| 94 }, | 94 }, |
| 95 { | 95 { |
| 96 'target_name': 'mojo_public_environment_unittests', | 96 'target_name': 'mojo_public_environment_unittests', |
| 97 'type': 'executable', | 97 'type': 'executable', |
| 98 'dependencies': [ | 98 'dependencies': [ |
| 99 '../base/base.gyp:base', | 99 '../base/base.gyp:base', |
| 100 '../testing/gtest.gyp:gtest', | 100 '../testing/gtest.gyp:gtest', |
| 101 'mojo_environment_standalone', | 101 'mojo_environment_standalone', |
| 102 'mojo_public_test_support', | 102 'mojo_public_test_utils', |
| 103 'mojo_run_all_unittests', | 103 'mojo_run_all_unittests', |
| 104 'mojo_system', | 104 'mojo_system', |
| 105 'mojo_utility', | 105 'mojo_utility', |
| 106 ], | 106 ], |
| 107 'sources': [ | 107 'sources': [ |
| 108 'public/environment/tests/async_waiter_unittest.cc', | 108 'public/environment/tests/async_waiter_unittest.cc', |
| 109 ], | 109 ], |
| 110 }, | 110 }, |
| 111 { | 111 { |
| 112 'target_name': 'mojo_public_system_unittests', | 112 'target_name': 'mojo_public_system_unittests', |
| 113 'type': 'executable', | 113 'type': 'executable', |
| 114 'dependencies': [ | 114 'dependencies': [ |
| 115 '../base/base.gyp:base', | 115 '../base/base.gyp:base', |
| 116 '../testing/gtest.gyp:gtest', | 116 '../testing/gtest.gyp:gtest', |
| 117 'mojo_bindings', | 117 'mojo_bindings', |
| 118 'mojo_public_test_support', | 118 'mojo_public_test_utils', |
| 119 'mojo_run_all_unittests', | 119 'mojo_run_all_unittests', |
| 120 'mojo_system', | 120 'mojo_system', |
| 121 ], | 121 ], |
| 122 'sources': [ | 122 'sources': [ |
| 123 'public/tests/system/core_cpp_unittest.cc', | 123 'public/tests/system/core_cpp_unittest.cc', |
| 124 'public/tests/system/core_unittest.cc', | 124 'public/tests/system/core_unittest.cc', |
| 125 'public/tests/system/core_unittest_pure_c.c', | 125 'public/tests/system/core_unittest_pure_c.c', |
| 126 ], | 126 ], |
| 127 }, | 127 }, |
| 128 { | 128 { |
| 129 'target_name': 'mojo_public_utility_unittests', | 129 'target_name': 'mojo_public_utility_unittests', |
| 130 'type': 'executable', | 130 'type': 'executable', |
| 131 'dependencies': [ | 131 'dependencies': [ |
| 132 '../base/base.gyp:base', | 132 '../base/base.gyp:base', |
| 133 '../testing/gtest.gyp:gtest', | 133 '../testing/gtest.gyp:gtest', |
| 134 'mojo_bindings', | 134 'mojo_bindings', |
| 135 'mojo_public_test_support', | 135 'mojo_public_test_utils', |
| 136 'mojo_run_all_unittests', | 136 'mojo_run_all_unittests', |
| 137 'mojo_system', | 137 'mojo_system', |
| 138 'mojo_utility', | 138 'mojo_utility', |
| 139 ], | 139 ], |
| 140 'sources': [ | 140 'sources': [ |
| 141 'public/utility/tests/mutex_unittest.cc', | 141 'public/utility/tests/mutex_unittest.cc', |
| 142 'public/utility/tests/run_loop_unittest.cc', | 142 'public/utility/tests/run_loop_unittest.cc', |
| 143 'public/utility/tests/thread_unittest.cc', | 143 'public/utility/tests/thread_unittest.cc', |
| 144 ], | 144 ], |
| 145 'conditions': [ | 145 'conditions': [ |
| 146 # See crbug.com/342893: | 146 # See crbug.com/342893: |
| 147 ['OS=="win"', { | 147 ['OS=="win"', { |
| 148 'sources!': [ | 148 'sources!': [ |
| 149 'public/utility/tests/mutex_unittest.cc', | 149 'public/utility/tests/mutex_unittest.cc', |
| 150 'public/utility/tests/thread_unittest.cc', | 150 'public/utility/tests/thread_unittest.cc', |
| 151 ], | 151 ], |
| 152 }], | 152 }], |
| 153 ], | 153 ], |
| 154 }, | 154 }, |
| 155 { | 155 { |
| 156 'target_name': 'mojo_public_system_perftests', | 156 'target_name': 'mojo_public_system_perftests', |
| 157 'type': 'executable', | 157 'type': 'executable', |
| 158 'dependencies': [ | 158 'dependencies': [ |
| 159 '../base/base.gyp:base', | 159 '../base/base.gyp:base', |
| 160 '../testing/gtest.gyp:gtest', | 160 '../testing/gtest.gyp:gtest', |
| 161 'mojo_public_test_support', | 161 'mojo_public_test_utils', |
| 162 'mojo_run_all_perftests', | 162 'mojo_run_all_perftests', |
| 163 'mojo_system', | 163 'mojo_system', |
| 164 ], | 164 ], |
| 165 'sources': [ | 165 'sources': [ |
| 166 'public/tests/system/core_perftest.cc', | 166 'public/tests/system/core_perftest.cc', |
| 167 ], | 167 ], |
| 168 }, | 168 }, |
| 169 { | 169 { |
| 170 'target_name': 'mojo_bindings', | 170 'target_name': 'mojo_bindings', |
| 171 'type': 'static_library', | 171 'type': 'static_library', |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 'public/shell/service.h', | 275 'public/shell/service.h', |
| 276 ], | 276 ], |
| 277 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ], | 277 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ], |
| 278 'export_dependent_settings': [ | 278 'export_dependent_settings': [ |
| 279 'mojo_bindings', | 279 'mojo_bindings', |
| 280 'mojo_system', | 280 'mojo_system', |
| 281 ], | 281 ], |
| 282 }, | 282 }, |
| 283 ], | 283 ], |
| 284 } | 284 } |
| OLD | NEW |