| 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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 'type': 'executable', | 185 'type': 'executable', |
| 186 'dependencies': [ | 186 'dependencies': [ |
| 187 '../base/base.gyp:base', | 187 '../base/base.gyp:base', |
| 188 '../testing/gtest.gyp:gtest', | 188 '../testing/gtest.gyp:gtest', |
| 189 'mojo_bindings', | 189 'mojo_bindings', |
| 190 'mojo_public_test_utils', | 190 'mojo_public_test_utils', |
| 191 'mojo_run_all_unittests', | 191 'mojo_run_all_unittests', |
| 192 'mojo_system', | 192 'mojo_system', |
| 193 ], | 193 ], |
| 194 'sources': [ | 194 'sources': [ |
| 195 'public/c/tests/system/core_unittest.cc', | 195 'public/c/system/tests/core_unittest.cc', |
| 196 'public/c/tests/system/core_unittest_pure_c.c', | 196 'public/c/system/tests/core_unittest_pure_c.c', |
| 197 'public/c/tests/system/macros_unittest.cc', | 197 'public/c/system/tests/macros_unittest.cc', |
| 198 'public/cpp/tests/system/core_unittest.cc', | 198 'public/cpp/system/tests/core_unittest.cc', |
| 199 'public/cpp/tests/system/macros_unittest.cc', | 199 'public/cpp/system/tests/macros_unittest.cc', |
| 200 ], | 200 ], |
| 201 }, | 201 }, |
| 202 { | 202 { |
| 203 'target_name': 'mojo_public_utility_unittests', | 203 'target_name': 'mojo_public_utility_unittests', |
| 204 'type': 'executable', | 204 'type': 'executable', |
| 205 'dependencies': [ | 205 'dependencies': [ |
| 206 '../base/base.gyp:base', | 206 '../base/base.gyp:base', |
| 207 '../testing/gtest.gyp:gtest', | 207 '../testing/gtest.gyp:gtest', |
| 208 'mojo_bindings', | 208 'mojo_bindings', |
| 209 'mojo_public_test_utils', | 209 'mojo_public_test_utils', |
| 210 'mojo_run_all_unittests', | 210 'mojo_run_all_unittests', |
| 211 'mojo_system', | 211 'mojo_system', |
| 212 'mojo_utility', | 212 'mojo_utility', |
| 213 ], | 213 ], |
| 214 'sources': [ | 214 'sources': [ |
| 215 'public/cpp/tests/utility/mutex_unittest.cc', | 215 'public/cpp/utility/tests/mutex_unittest.cc', |
| 216 'public/cpp/tests/utility/run_loop_unittest.cc', | 216 'public/cpp/utility/tests/run_loop_unittest.cc', |
| 217 'public/cpp/tests/utility/thread_unittest.cc', | 217 'public/cpp/utility/tests/thread_unittest.cc', |
| 218 ], | 218 ], |
| 219 'conditions': [ | 219 'conditions': [ |
| 220 # See crbug.com/342893: | 220 # See crbug.com/342893: |
| 221 ['OS=="win"', { | 221 ['OS=="win"', { |
| 222 'sources!': [ | 222 'sources!': [ |
| 223 'public/cpp/tests/utility/mutex_unittest.cc', | 223 'public/cpp/utility/tests/mutex_unittest.cc', |
| 224 'public/cpp/tests/utility/thread_unittest.cc', | 224 'public/cpp/utility/tests/thread_unittest.cc', |
| 225 ], | 225 ], |
| 226 }], | 226 }], |
| 227 ], | 227 ], |
| 228 }, | 228 }, |
| 229 { | 229 { |
| 230 'target_name': 'mojo_public_system_perftests', | 230 'target_name': 'mojo_public_system_perftests', |
| 231 'type': 'executable', | 231 'type': 'executable', |
| 232 'dependencies': [ | 232 'dependencies': [ |
| 233 '../base/base.gyp:base', | 233 '../base/base.gyp:base', |
| 234 '../testing/gtest.gyp:gtest', | 234 '../testing/gtest.gyp:gtest', |
| 235 'mojo_public_test_utils', | 235 'mojo_public_test_utils', |
| 236 'mojo_run_all_perftests', | 236 'mojo_run_all_perftests', |
| 237 'mojo_system', | 237 'mojo_system', |
| 238 'mojo_utility', | 238 'mojo_utility', |
| 239 ], | 239 ], |
| 240 'sources': [ | 240 'sources': [ |
| 241 'public/c/tests/system/core_perftest.cc', | 241 'public/c/system/tests/core_perftest.cc', |
| 242 ], | 242 ], |
| 243 }, | 243 }, |
| 244 { | 244 { |
| 245 'target_name': 'mojo_bindings', | 245 'target_name': 'mojo_bindings', |
| 246 'type': 'static_library', | 246 'type': 'static_library', |
| 247 'include_dirs': [ | 247 'include_dirs': [ |
| 248 '..' | 248 '..' |
| 249 ], | 249 ], |
| 250 'sources': [ | 250 'sources': [ |
| 251 'public/bindings/allocation_scope.h', | 251 'public/bindings/allocation_scope.h', |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 ], | 385 ], |
| 386 'dependencies': [ | 386 'dependencies': [ |
| 387 'mojo_shell_bindings', | 387 'mojo_shell_bindings', |
| 388 ], | 388 ], |
| 389 'export_dependent_settings': [ | 389 'export_dependent_settings': [ |
| 390 'mojo_shell_bindings', | 390 'mojo_shell_bindings', |
| 391 ], | 391 ], |
| 392 }, | 392 }, |
| 393 ], | 393 ], |
| 394 } | 394 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 218023002:
Mojo: Move mojo/public/{c,cpp}/tests/FOO to mojo/public/{c,cpp}/FOO/tests. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src