| 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 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 # mini_installer_tests depends on mini_installer. This should be | 306 # mini_installer_tests depends on mini_installer. This should be |
| 307 # defined in installer.gyp. | 307 # defined in installer.gyp. |
| 308 '../chrome/installer/mini_installer.gyp:mini_installer', | 308 '../chrome/installer/mini_installer.gyp:mini_installer', |
| 309 '../chrome_elf/chrome_elf.gyp:chrome_elf_unittests', | 309 '../chrome_elf/chrome_elf.gyp:chrome_elf_unittests', |
| 310 '../content/content_shell_and_tests.gyp:copy_test_netscape_plugin', | 310 '../content/content_shell_and_tests.gyp:copy_test_netscape_plugin', |
| 311 '../courgette/courgette.gyp:courgette_unittests', | 311 '../courgette/courgette.gyp:courgette_unittests', |
| 312 '../sandbox/sandbox.gyp:sbox_integration_tests', | 312 '../sandbox/sandbox.gyp:sbox_integration_tests', |
| 313 '../sandbox/sandbox.gyp:sbox_unittests', | 313 '../sandbox/sandbox.gyp:sbox_unittests', |
| 314 '../sandbox/sandbox.gyp:sbox_validation_tests', | 314 '../sandbox/sandbox.gyp:sbox_validation_tests', |
| 315 '../ui/app_list/app_list.gyp:app_list_unittests', | 315 '../ui/app_list/app_list.gyp:app_list_unittests', |
| 316 '../ui/views/views.gyp:views_unittests', | |
| 317 ], | 316 ], |
| 318 'conditions': [ | 317 'conditions': [ |
| 319 # remoting_host_installation uses lots of non-trivial GYP that tend | 318 # remoting_host_installation uses lots of non-trivial GYP that tend |
| 320 # to break because of differences between ninja and msbuild. Make | 319 # to break because of differences between ninja and msbuild. Make |
| 321 # sure this target is built by the builders on the main waterfall. | 320 # sure this target is built by the builders on the main waterfall. |
| 322 # See http://crbug.com/180600. | 321 # See http://crbug.com/180600. |
| 323 ['wix_exists == "True" and sas_dll_exists == "True"', { | 322 ['wix_exists == "True" and sas_dll_exists == "True"', { |
| 324 'dependencies': [ | 323 'dependencies': [ |
| 325 '../remoting/remoting.gyp:remoting_host_installation', | 324 '../remoting/remoting.gyp:remoting_host_installation', |
| 326 ], | 325 ], |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 376 'dependencies': [ | 375 'dependencies': [ |
| 377 '../printing/printing.gyp:printing_unittests', | 376 '../printing/printing.gyp:printing_unittests', |
| 378 ], | 377 ], |
| 379 }], | 378 }], |
| 380 ['use_aura==1', { | 379 ['use_aura==1', { |
| 381 'dependencies': [ | 380 'dependencies': [ |
| 382 '../ui/app_list/app_list.gyp:app_list_unittests', | 381 '../ui/app_list/app_list.gyp:app_list_unittests', |
| 383 '../ui/aura/aura.gyp:aura_unittests', | 382 '../ui/aura/aura.gyp:aura_unittests', |
| 384 '../ui/compositor/compositor.gyp:compositor_unittests', | 383 '../ui/compositor/compositor.gyp:compositor_unittests', |
| 385 '../ui/keyboard/keyboard.gyp:keyboard_unittests', | 384 '../ui/keyboard/keyboard.gyp:keyboard_unittests', |
| 385 '../ui/views/views.gyp:views_unittests', |
| 386 ], | 386 ], |
| 387 }], | 387 }], |
| 388 ['use_aura==1 or toolkit_views==1', { | 388 ['use_aura==1 or toolkit_views==1', { |
| 389 'dependencies': [ | 389 'dependencies': [ |
| 390 '../ui/events/events.gyp:events_unittests', | 390 '../ui/events/events.gyp:events_unittests', |
| 391 ], | 391 ], |
| 392 }], | 392 }], |
| 393 ['use_ash==1', { | 393 ['use_ash==1', { |
| 394 'dependencies': [ | 394 'dependencies': [ |
| 395 '../ash/ash.gyp:ash_unittests', | 395 '../ash/ash.gyp:ash_unittests', |
| (...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1233 # http://crbug.com/157234 | 1233 # http://crbug.com/157234 |
| 1234 #'../chrome/chrome.gyp:sync_integration_tests_run', | 1234 #'../chrome/chrome.gyp:sync_integration_tests_run', |
| 1235 '../chrome/chrome.gyp:unit_tests_run', | 1235 '../chrome/chrome.gyp:unit_tests_run', |
| 1236 '../net/net.gyp:net_unittests_run', | 1236 '../net/net.gyp:net_unittests_run', |
| 1237 ], | 1237 ], |
| 1238 }, # target_name: chromium_swarm_tests | 1238 }, # target_name: chromium_swarm_tests |
| 1239 ], | 1239 ], |
| 1240 }], | 1240 }], |
| 1241 ], # conditions | 1241 ], # conditions |
| 1242 } | 1242 } |
| OLD | NEW |