| 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 'variables': { | 6 'variables': { |
| 7 # A hook that can be overridden in other repositories to add additional | 7 # A hook that can be overridden in other repositories to add additional |
| 8 # compilation targets to 'All'. Only used on Android. | 8 # compilation targets to 'All'. Only used on Android. |
| 9 'android_app_targets%': [], | 9 'android_app_targets%': [], |
| 10 }, | 10 }, |
| (...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 597 'chromium_builder_qa', # needed for perf pyauto tests | 597 'chromium_builder_qa', # needed for perf pyauto tests |
| 598 ], | 598 ], |
| 599 }, # target_name: chromium_builder_perf_av | 599 }, # target_name: chromium_builder_perf_av |
| 600 { | 600 { |
| 601 # This target contains everything we need to run tests on the special | 601 # This target contains everything we need to run tests on the special |
| 602 # device-equipped WebRTC bots. We have device-requiring tests in | 602 # device-equipped WebRTC bots. We have device-requiring tests in |
| 603 # browser_tests and content_browsertests. | 603 # browser_tests and content_browsertests. |
| 604 'target_name': 'chromium_builder_webrtc', | 604 'target_name': 'chromium_builder_webrtc', |
| 605 'type': 'none', | 605 'type': 'none', |
| 606 'dependencies': [ | 606 'dependencies': [ |
| 607 'chromium_builder_qa', # needed for perf pyauto tests | 607 'chromium_builder_qa', # TODO(phoglund): not sure if needed? |
| 608 '../chrome/chrome.gyp:browser_tests', | 608 '../chrome/chrome.gyp:browser_tests', |
| 609 '../content/content_shell_and_tests.gyp:content_browsertests', | 609 '../content/content_shell_and_tests.gyp:content_browsertests', |
| 610 '../content/content_shell_and_tests.gyp:content_unittests', | 610 '../content/content_shell_and_tests.gyp:content_unittests', |
| 611 '../third_party/libjingle/libjingle.gyp:peerconnection_server', | |
| 612 '../third_party/webrtc/tools/tools.gyp:frame_analyzer', | 611 '../third_party/webrtc/tools/tools.gyp:frame_analyzer', |
| 613 '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter', | 612 '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter', |
| 614 ], | 613 ], |
| 615 'conditions': [ | 614 'conditions': [ |
| 616 ['OS=="win"', { | 615 ['OS=="win"', { |
| 617 'dependencies': [ | 616 'dependencies': [ |
| 618 '../chrome/chrome.gyp:crash_service', | 617 '../chrome/chrome.gyp:crash_service', |
| 619 ], | 618 ], |
| 620 }], | 619 }], |
| 621 ], | 620 ], |
| (...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1241 # http://crbug.com/157234 | 1240 # http://crbug.com/157234 |
| 1242 #'../chrome/chrome.gyp:sync_integration_tests_run', | 1241 #'../chrome/chrome.gyp:sync_integration_tests_run', |
| 1243 '../chrome/chrome.gyp:unit_tests_run', | 1242 '../chrome/chrome.gyp:unit_tests_run', |
| 1244 '../net/net.gyp:net_unittests_run', | 1243 '../net/net.gyp:net_unittests_run', |
| 1245 ], | 1244 ], |
| 1246 }, # target_name: chromium_swarm_tests | 1245 }, # target_name: chromium_swarm_tests |
| 1247 ], | 1246 ], |
| 1248 }], | 1247 }], |
| 1249 ], # conditions | 1248 ], # conditions |
| 1250 } | 1249 } |
| OLD | NEW |