| 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 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1199 ], | 1199 ], |
| 1200 }, | 1200 }, |
| 1201 ], # targets | 1201 ], # targets |
| 1202 }, { | 1202 }, { |
| 1203 # TODO(thakis): Remove this once the linux gtk bot no longer references | 1203 # TODO(thakis): Remove this once the linux gtk bot no longer references |
| 1204 # it (probably after the first aura release on linux), see r249162 | 1204 # it (probably after the first aura release on linux), see r249162 |
| 1205 'targets': [ | 1205 'targets': [ |
| 1206 { | 1206 { |
| 1207 'target_name': 'aura_builder', | 1207 'target_name': 'aura_builder', |
| 1208 'type': 'none', | 1208 'type': 'none', |
| 1209 'dependencies': [ |
| 1210 '../chrome/chrome.gyp:chrome', |
| 1211 ], |
| 1209 }, | 1212 }, |
| 1210 ], # targets | 1213 ], # targets |
| 1211 }], # "use_aura==1" | 1214 }], # "use_aura==1" |
| 1212 ['test_isolation_mode != "noop"', { | 1215 ['test_isolation_mode != "noop"', { |
| 1213 'targets': [ | 1216 'targets': [ |
| 1214 { | 1217 { |
| 1215 'target_name': 'chromium_swarm_tests', | 1218 'target_name': 'chromium_swarm_tests', |
| 1216 'type': 'none', | 1219 'type': 'none', |
| 1217 'dependencies': [ | 1220 'dependencies': [ |
| 1218 '../base/base.gyp:base_unittests_run', | 1221 '../base/base.gyp:base_unittests_run', |
| 1219 '../chrome/chrome.gyp:browser_tests_run', | 1222 '../chrome/chrome.gyp:browser_tests_run', |
| 1220 '../chrome/chrome.gyp:interactive_ui_tests_run', | 1223 '../chrome/chrome.gyp:interactive_ui_tests_run', |
| 1221 '../chrome/chrome.gyp:sync_integration_tests_run', | 1224 '../chrome/chrome.gyp:sync_integration_tests_run', |
| 1222 '../chrome/chrome.gyp:unit_tests_run', | 1225 '../chrome/chrome.gyp:unit_tests_run', |
| 1223 '../net/net.gyp:net_unittests_run', | 1226 '../net/net.gyp:net_unittests_run', |
| 1224 ], | 1227 ], |
| 1225 }, # target_name: chromium_swarm_tests | 1228 }, # target_name: chromium_swarm_tests |
| 1226 ], | 1229 ], |
| 1227 }], | 1230 }], |
| 1228 ], # conditions | 1231 ], # conditions |
| 1229 } | 1232 } |
| OLD | NEW |