| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'All', | 8 'target_name': 'All', |
| 9 'type': 'none', | 9 'type': 'none', |
| 10 'xcode_create_dependents_test_runner': 1, | 10 'xcode_create_dependents_test_runner': 1, |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 { | 344 { |
| 345 'target_name': 'chromium_builder_webrtc', | 345 'target_name': 'chromium_builder_webrtc', |
| 346 'type': 'none', | 346 'type': 'none', |
| 347 'dependencies': [ | 347 'dependencies': [ |
| 348 'chromium_builder_qa', # needed for perf pyauto tests | 348 'chromium_builder_qa', # needed for perf pyauto tests |
| 349 '../third_party/libjingle/libjingle.gyp:peerconnection_server', | 349 '../third_party/libjingle/libjingle.gyp:peerconnection_server', |
| 350 '../third_party/webrtc/tools/tools.gyp:frame_analyzer', | 350 '../third_party/webrtc/tools/tools.gyp:frame_analyzer', |
| 351 '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter', | 351 '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter', |
| 352 ], | 352 ], |
| 353 }, # target_name: chromium_builder_webrtc | 353 }, # target_name: chromium_builder_webrtc |
| 354 { | |
| 355 'target_name': 'chromium_builder_nacl_sdk', | |
| 356 'type': 'none', | |
| 357 'dependencies': [ | |
| 358 '../chrome/chrome.gyp:chrome', | |
| 359 '../native_client_sdk/src/build_tools/nacl_ppapi_sdk.gyp:*', | |
| 360 ], | |
| 361 'conditions': [ | |
| 362 ['OS=="win"', { | |
| 363 'dependencies': [ | |
| 364 '../chrome/chrome.gyp:chrome_nacl_win64', | |
| 365 ], | |
| 366 }], | |
| 367 ], | |
| 368 }, # target_name: chromium_builder_nacl_sdk | |
| 369 ], # targets | 354 ], # targets |
| 370 }], | 355 }], |
| 371 ['OS=="mac"', { | 356 ['OS=="mac"', { |
| 372 'targets': [ | 357 'targets': [ |
| 373 { | 358 { |
| 374 # Target to build everything plus the dmg. We don't put the dmg | 359 # Target to build everything plus the dmg. We don't put the dmg |
| 375 # in the All target because developers really don't need it. | 360 # in the All target because developers really don't need it. |
| 376 'target_name': 'all_and_dmg', | 361 'target_name': 'all_and_dmg', |
| 377 'type': 'none', | 362 'type': 'none', |
| 378 'dependencies': [ | 363 'dependencies': [ |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 747 '../chrome/chrome.gyp:browser_tests_run', | 732 '../chrome/chrome.gyp:browser_tests_run', |
| 748 '../chrome/chrome.gyp:sync_integration_tests_run', | 733 '../chrome/chrome.gyp:sync_integration_tests_run', |
| 749 '../chrome/chrome.gyp:unit_tests_run', | 734 '../chrome/chrome.gyp:unit_tests_run', |
| 750 '../net/net.gyp:net_unittests_run', | 735 '../net/net.gyp:net_unittests_run', |
| 751 ], | 736 ], |
| 752 }, # target_name: chromium_swarm_tests | 737 }, # target_name: chromium_swarm_tests |
| 753 ], | 738 ], |
| 754 }], | 739 }], |
| 755 ], # conditions | 740 ], # conditions |
| 756 } | 741 } |
| OLD | NEW |