| 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 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1224 }], # "use_aura==1" | 1224 }], # "use_aura==1" |
| 1225 ['test_isolation_mode != "noop"', { | 1225 ['test_isolation_mode != "noop"', { |
| 1226 'targets': [ | 1226 'targets': [ |
| 1227 { | 1227 { |
| 1228 'target_name': 'chromium_swarm_tests', | 1228 'target_name': 'chromium_swarm_tests', |
| 1229 'type': 'none', | 1229 'type': 'none', |
| 1230 'dependencies': [ | 1230 'dependencies': [ |
| 1231 '../base/base.gyp:base_unittests_run', | 1231 '../base/base.gyp:base_unittests_run', |
| 1232 '../chrome/chrome.gyp:browser_tests_run', | 1232 '../chrome/chrome.gyp:browser_tests_run', |
| 1233 '../chrome/chrome.gyp:interactive_ui_tests_run', | 1233 '../chrome/chrome.gyp:interactive_ui_tests_run', |
| 1234 '../chrome/chrome.gyp:sync_integration_tests_run', | 1234 # http://crbug.com/157234 |
| 1235 #'../chrome/chrome.gyp:sync_integration_tests_run', |
| 1235 '../chrome/chrome.gyp:unit_tests_run', | 1236 '../chrome/chrome.gyp:unit_tests_run', |
| 1236 '../net/net.gyp:net_unittests_run', | 1237 '../net/net.gyp:net_unittests_run', |
| 1237 ], | 1238 ], |
| 1238 }, # target_name: chromium_swarm_tests | 1239 }, # target_name: chromium_swarm_tests |
| 1239 ], | 1240 ], |
| 1240 }], | 1241 }], |
| 1241 ], # conditions | 1242 ], # conditions |
| 1242 } | 1243 } |
| OLD | NEW |