| 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 1243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1254 }], # "use_aura==1" | 1254 }], # "use_aura==1" |
| 1255 ['test_isolation_mode != "noop"', { | 1255 ['test_isolation_mode != "noop"', { |
| 1256 'targets': [ | 1256 'targets': [ |
| 1257 { | 1257 { |
| 1258 'target_name': 'chromium_swarm_tests', | 1258 'target_name': 'chromium_swarm_tests', |
| 1259 'type': 'none', | 1259 'type': 'none', |
| 1260 'dependencies': [ | 1260 'dependencies': [ |
| 1261 '../base/base.gyp:base_unittests_run', | 1261 '../base/base.gyp:base_unittests_run', |
| 1262 '../chrome/chrome.gyp:browser_tests_run', | 1262 '../chrome/chrome.gyp:browser_tests_run', |
| 1263 '../chrome/chrome.gyp:interactive_ui_tests_run', | 1263 '../chrome/chrome.gyp:interactive_ui_tests_run', |
| 1264 # http://crbug.com/157234 | 1264 '../chrome/chrome.gyp:sync_integration_tests_run', |
| 1265 #'../chrome/chrome.gyp:sync_integration_tests_run', | |
| 1266 '../chrome/chrome.gyp:unit_tests_run', | 1265 '../chrome/chrome.gyp:unit_tests_run', |
| 1267 '../content/content_shell_and_tests.gyp:content_browsertests_run', | 1266 '../content/content_shell_and_tests.gyp:content_browsertests_run', |
| 1268 '../content/content_shell_and_tests.gyp:content_unittests_run', | 1267 '../content/content_shell_and_tests.gyp:content_unittests_run', |
| 1269 '../net/net.gyp:net_unittests_run', | 1268 '../net/net.gyp:net_unittests_run', |
| 1270 ], | 1269 ], |
| 1271 }, # target_name: chromium_swarm_tests | 1270 }, # target_name: chromium_swarm_tests |
| 1272 ], | 1271 ], |
| 1273 }], | 1272 }], |
| 1274 ['OS=="mac" and toolkit_views==1', { | 1273 ['OS=="mac" and toolkit_views==1', { |
| 1275 'targets': [ | 1274 'targets': [ |
| 1276 { | 1275 { |
| 1277 'target_name': 'macviews_builder', | 1276 'target_name': 'macviews_builder', |
| 1278 'type': 'none', | 1277 'type': 'none', |
| 1279 'dependencies': [ | 1278 'dependencies': [ |
| 1280 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 1279 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', |
| 1281 '../ui/views/views.gyp:views', | 1280 '../ui/views/views.gyp:views', |
| 1282 '../ui/views/views.gyp:views_unittests', | 1281 '../ui/views/views.gyp:views_unittests', |
| 1283 ], | 1282 ], |
| 1284 }, # target_name: macviews_builder | 1283 }, # target_name: macviews_builder |
| 1285 ], # targets | 1284 ], # targets |
| 1286 }], # os=='mac' and toolkit_views==1 | 1285 }], # os=='mac' and toolkit_views==1 |
| 1287 ], # conditions | 1286 ], # conditions |
| 1288 } | 1287 } |
| OLD | NEW |