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 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1241 { | 1241 { |
1242 'target_name': 'chromium_swarm_tests', | 1242 'target_name': 'chromium_swarm_tests', |
1243 'type': 'none', | 1243 'type': 'none', |
1244 'dependencies': [ | 1244 'dependencies': [ |
1245 '../base/base.gyp:base_unittests_run', | 1245 '../base/base.gyp:base_unittests_run', |
1246 '../chrome/chrome.gyp:browser_tests_run', | 1246 '../chrome/chrome.gyp:browser_tests_run', |
1247 '../chrome/chrome.gyp:interactive_ui_tests_run', | 1247 '../chrome/chrome.gyp:interactive_ui_tests_run', |
1248 # http://crbug.com/157234 | 1248 # http://crbug.com/157234 |
1249 #'../chrome/chrome.gyp:sync_integration_tests_run', | 1249 #'../chrome/chrome.gyp:sync_integration_tests_run', |
1250 '../chrome/chrome.gyp:unit_tests_run', | 1250 '../chrome/chrome.gyp:unit_tests_run', |
| 1251 '../content/content_shell_and_tests.gyp:content_browsertests_run', |
| 1252 '../content/content_shell_and_tests.gyp:content_unittests_run', |
1251 '../net/net.gyp:net_unittests_run', | 1253 '../net/net.gyp:net_unittests_run', |
1252 ], | 1254 ], |
1253 }, # target_name: chromium_swarm_tests | 1255 }, # target_name: chromium_swarm_tests |
1254 ], | 1256 ], |
1255 }], | 1257 }], |
1256 ['OS=="mac" and toolkit_views==1', { | 1258 ['OS=="mac" and toolkit_views==1', { |
1257 'targets': [ | 1259 'targets': [ |
1258 { | 1260 { |
1259 'target_name': 'macviews_builder', | 1261 'target_name': 'macviews_builder', |
1260 'type': 'none', | 1262 'type': 'none', |
1261 'dependencies': [ | 1263 'dependencies': [ |
1262 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 1264 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', |
1263 '../ui/views/views.gyp:views', | 1265 '../ui/views/views.gyp:views', |
1264 '../ui/views/views.gyp:views_unittests', | 1266 '../ui/views/views.gyp:views_unittests', |
1265 ], | 1267 ], |
1266 }, # target_name: macviews_builder | 1268 }, # target_name: macviews_builder |
1267 ], # targets | 1269 ], # targets |
1268 }], # os=='mac' and toolkit_views==1 | 1270 }], # os=='mac' and toolkit_views==1 |
1269 ], # conditions | 1271 ], # conditions |
1270 } | 1272 } |
OLD | NEW |