| 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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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/utility/tests/mutex_unittest.cc', | 215 'public/cpp/tests/utility/mutex_unittest.cc', |
| 216 'public/utility/tests/run_loop_unittest.cc', | 216 'public/cpp/tests/utility/run_loop_unittest.cc', |
| 217 'public/utility/tests/thread_unittest.cc', | 217 'public/cpp/tests/utility/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/utility/tests/mutex_unittest.cc', | 223 'public/cpp/tests/utility/mutex_unittest.cc', |
| 224 'public/utility/tests/thread_unittest.cc', | 224 'public/cpp/tests/utility/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', |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 'public/environment/lib/environment.cc', | 323 'public/environment/lib/environment.cc', |
| 324 ], | 324 ], |
| 325 'include_dirs': [ | 325 'include_dirs': [ |
| 326 '..', | 326 '..', |
| 327 ], | 327 ], |
| 328 }, | 328 }, |
| 329 { | 329 { |
| 330 'target_name': 'mojo_utility', | 330 'target_name': 'mojo_utility', |
| 331 'type': 'static_library', | 331 'type': 'static_library', |
| 332 'sources': [ | 332 'sources': [ |
| 333 'public/utility/mutex.h', | 333 'public/cpp/utility/mutex.h', |
| 334 'public/utility/run_loop.h', | 334 'public/cpp/utility/run_loop.h', |
| 335 'public/utility/run_loop_handler.h', | 335 'public/cpp/utility/run_loop_handler.h', |
| 336 'public/utility/thread.h', | 336 'public/cpp/utility/thread.h', |
| 337 'public/utility/lib/mutex.cc', | 337 'public/cpp/utility/lib/mutex.cc', |
| 338 'public/utility/lib/run_loop.cc', | 338 'public/cpp/utility/lib/run_loop.cc', |
| 339 'public/utility/lib/thread.cc', | 339 'public/cpp/utility/lib/thread.cc', |
| 340 'public/utility/lib/thread_local.h', | 340 'public/cpp/utility/lib/thread_local.h', |
| 341 'public/utility/lib/thread_local_posix.cc', | 341 'public/cpp/utility/lib/thread_local_posix.cc', |
| 342 'public/utility/lib/thread_local_win.cc', | 342 'public/cpp/utility/lib/thread_local_win.cc', |
| 343 ], | 343 ], |
| 344 'conditions': [ | 344 'conditions': [ |
| 345 # See crbug.com/342893: | 345 # See crbug.com/342893: |
| 346 ['OS=="win"', { | 346 ['OS=="win"', { |
| 347 'sources!': [ | 347 'sources!': [ |
| 348 'public/utility/mutex.h', | 348 'public/cpp/utility/mutex.h', |
| 349 'public/utility/thread.h', | 349 'public/cpp/utility/thread.h', |
| 350 'public/utility/lib/mutex.cc', | 350 'public/cpp/utility/lib/mutex.cc', |
| 351 'public/utility/lib/thread.cc', | 351 'public/cpp/utility/lib/thread.cc', |
| 352 ], | 352 ], |
| 353 }], | 353 }], |
| 354 ], | 354 ], |
| 355 'include_dirs': [ | 355 'include_dirs': [ |
| 356 '..', | 356 '..', |
| 357 ], | 357 ], |
| 358 }, | 358 }, |
| 359 { | 359 { |
| 360 'target_name': 'mojo_shell_bindings', | 360 'target_name': 'mojo_shell_bindings', |
| 361 'type': 'static_library', | 361 'type': 'static_library', |
| (...skipping 23 matching lines...) Expand all 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 |