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 1185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1196 '../ipc/ipc.gyp:ipc_tests', | 1196 '../ipc/ipc.gyp:ipc_tests', |
1197 '../sql/sql.gyp:sql_unittests', | 1197 '../sql/sql.gyp:sql_unittests', |
1198 '../sync/sync.gyp:sync_unit_tests', | 1198 '../sync/sync.gyp:sync_unit_tests', |
1199 ], | 1199 ], |
1200 }], | 1200 }], |
1201 ['chromeos==1', { | 1201 ['chromeos==1', { |
1202 'dependencies': [ | 1202 'dependencies': [ |
1203 '../chromeos/chromeos.gyp:chromeos_unittests', | 1203 '../chromeos/chromeos.gyp:chromeos_unittests', |
1204 ], | 1204 ], |
1205 }], | 1205 }], |
| 1206 ['use_ozone==1', { |
| 1207 'dependencies!': [ |
| 1208 '../chrome/chrome.gyp:interactive_ui_tests', # crbug.com/362166 |
| 1209 ], |
| 1210 }], |
1206 ], | 1211 ], |
1207 }, | 1212 }, |
1208 ], # targets | 1213 ], # targets |
1209 }, { | 1214 }, { |
1210 'conditions': [ | 1215 'conditions': [ |
1211 ['OS=="linux"', { | 1216 ['OS=="linux"', { |
1212 # TODO(thakis): Remove this once the linux gtk bot no longer reference
s | 1217 # TODO(thakis): Remove this once the linux gtk bot no longer reference
s |
1213 # it (probably after the first aura release on linux), see r249162 | 1218 # it (probably after the first aura release on linux), see r249162 |
1214 'targets': [ | 1219 'targets': [ |
1215 { | 1220 { |
(...skipping 18 matching lines...) Expand all Loading... |
1234 # http://crbug.com/157234 | 1239 # http://crbug.com/157234 |
1235 #'../chrome/chrome.gyp:sync_integration_tests_run', | 1240 #'../chrome/chrome.gyp:sync_integration_tests_run', |
1236 '../chrome/chrome.gyp:unit_tests_run', | 1241 '../chrome/chrome.gyp:unit_tests_run', |
1237 '../net/net.gyp:net_unittests_run', | 1242 '../net/net.gyp:net_unittests_run', |
1238 ], | 1243 ], |
1239 }, # target_name: chromium_swarm_tests | 1244 }, # target_name: chromium_swarm_tests |
1240 ], | 1245 ], |
1241 }], | 1246 }], |
1242 ], # conditions | 1247 ], # conditions |
1243 } | 1248 } |
OLD | NEW |