| 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 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 '../content/content_shell_and_tests.gyp:layout_test_helper', | 439 '../content/content_shell_and_tests.gyp:layout_test_helper', |
| 440 ], | 440 ], |
| 441 }], | 441 }], |
| 442 ['OS=="linux"', { | 442 ['OS=="linux"', { |
| 443 'dependencies': [ | 443 'dependencies': [ |
| 444 '../breakpad/breakpad.gyp:dump_syms', | 444 '../breakpad/breakpad.gyp:dump_syms', |
| 445 ], | 445 ], |
| 446 }], | 446 }], |
| 447 ], | 447 ], |
| 448 }, # target_name: blink_tests | 448 }, # target_name: blink_tests |
| 449 { | |
| 450 # TODO(jochen): Eventually remove this target after everybody and | |
| 451 # the bots started to use blink_tests only. | |
| 452 'target_name': 'all_webkit', | |
| 453 'type': 'none', | |
| 454 'dependencies': [ | |
| 455 'blink_tests', | |
| 456 ], | |
| 457 }, # target_name: all_webkit | |
| 458 ], | 449 ], |
| 459 }], # OS!=ios | 450 }], # OS!=ios |
| 460 ['OS!="ios" and OS!="android"', { | 451 ['OS!="ios" and OS!="android"', { |
| 461 'targets': [ | 452 'targets': [ |
| 462 { | 453 { |
| 463 'target_name': 'chromium_builder_nacl_win_integration', | 454 'target_name': 'chromium_builder_nacl_win_integration', |
| 464 'type': 'none', | 455 'type': 'none', |
| 465 'dependencies': [ | 456 'dependencies': [ |
| 466 'chromium_builder_qa', # needed for pyauto | 457 'chromium_builder_qa', # needed for pyauto |
| 467 'chromium_builder_tests', | 458 'chromium_builder_tests', |
| (...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1244 # http://crbug.com/157234 | 1235 # http://crbug.com/157234 |
| 1245 #'../chrome/chrome.gyp:sync_integration_tests_run', | 1236 #'../chrome/chrome.gyp:sync_integration_tests_run', |
| 1246 '../chrome/chrome.gyp:unit_tests_run', | 1237 '../chrome/chrome.gyp:unit_tests_run', |
| 1247 '../net/net.gyp:net_unittests_run', | 1238 '../net/net.gyp:net_unittests_run', |
| 1248 ], | 1239 ], |
| 1249 }, # target_name: chromium_swarm_tests | 1240 }, # target_name: chromium_swarm_tests |
| 1250 ], | 1241 ], |
| 1251 }], | 1242 }], |
| 1252 ], # conditions | 1243 ], # conditions |
| 1253 } | 1244 } |
| OLD | NEW |