| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 # TODO(nsylvain) ui_tests.exe depends on test_shell_common. | 254 # TODO(nsylvain) ui_tests.exe depends on test_shell_common. |
| 255 # This should: | 255 # This should: |
| 256 # 1) not be the case. OR. | 256 # 1) not be the case. OR. |
| 257 # 2) be expressed in the ui tests dependencies. | 257 # 2) be expressed in the ui tests dependencies. |
| 258 '../webkit/webkit.gyp:test_shell_common', | 258 '../webkit/webkit.gyp:test_shell_common', |
| 259 ], | 259 ], |
| 260 }], | 260 }], |
| 261 ], | 261 ], |
| 262 }, # target_name: chromium_2010_builder_tests | 262 }, # target_name: chromium_2010_builder_tests |
| 263 { | 263 { |
| 264 'target_name': 'chromium_builder_nacl_win_integration', |
| 265 'type': 'none', |
| 266 'dependencies': [ |
| 267 'chromium_builder_qa', # needed for pyauto |
| 268 'chromium_builder_tests', |
| 269 ], |
| 270 }, # target_name: chromium_builder_nacl_win_integration |
| 271 { |
| 264 'target_name': 'chromium_builder_perf', | 272 'target_name': 'chromium_builder_perf', |
| 265 'type': 'none', | 273 'type': 'none', |
| 266 'dependencies': [ | 274 'dependencies': [ |
| 267 'chromium_builder_qa', # needed for pyauto | 275 'chromium_builder_qa', # needed for pyauto |
| 268 '../chrome/chrome.gyp:performance_ui_tests', | 276 '../chrome/chrome.gyp:performance_ui_tests', |
| 269 '../chrome/chrome.gyp:plugin_tests', | 277 '../chrome/chrome.gyp:plugin_tests', |
| 270 '../chrome/chrome.gyp:sync_performance_tests', | 278 '../chrome/chrome.gyp:sync_performance_tests', |
| 271 ], | 279 ], |
| 272 }, # target_name: chromium_builder_perf | 280 }, # target_name: chromium_builder_perf |
| 273 { | 281 { |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 561 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid
ation_unittests', | 569 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid
ation_unittests', |
| 562 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni
ttests', | 570 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni
ttests', |
| 563 '../views/views.gyp:views_unittests', | 571 '../views/views.gyp:views_unittests', |
| 564 'temp_gyp/googleurl.gyp:googleurl_unittests', | 572 'temp_gyp/googleurl.gyp:googleurl_unittests', |
| 565 ], | 573 ], |
| 566 }, | 574 }, |
| 567 ], # targets | 575 ], # targets |
| 568 }], # "chromeos==1" | 576 }], # "chromeos==1" |
| 569 ], # conditions | 577 ], # conditions |
| 570 } | 578 } |
| OLD | NEW |