| 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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 ['OS!="android" and OS!="ios"', { | 218 ['OS!="android" and OS!="ios"', { |
| 219 'dependencies': [ | 219 'dependencies': [ |
| 220 '../google_apis/gcm/gcm.gyp:*', | 220 '../google_apis/gcm/gcm.gyp:*', |
| 221 ], | 221 ], |
| 222 }], | 222 }], |
| 223 ['chromeos==1 or (OS=="linux" and use_aura==1)', { | 223 ['chromeos==1 or (OS=="linux" and use_aura==1)', { |
| 224 'dependencies': [ | 224 'dependencies': [ |
| 225 '../apps/shell/app_shell.gyp:*', | 225 '../apps/shell/app_shell.gyp:*', |
| 226 ], | 226 ], |
| 227 }], | 227 }], |
| 228 ['chromeos==1', { |
| 229 'dependencies': [ |
| 230 '../athena/main/athena_main.gyp:*', |
| 231 ], |
| 232 }], |
| 228 ], | 233 ], |
| 229 }, # target_name: All | 234 }, # target_name: All |
| 230 { | 235 { |
| 231 'target_name': 'All_syzygy', | 236 'target_name': 'All_syzygy', |
| 232 'type': 'none', | 237 'type': 'none', |
| 233 'conditions': [ | 238 'conditions': [ |
| 234 ['OS=="win" and fastbuild==0 and target_arch=="ia32" and ' | 239 ['OS=="win" and fastbuild==0 and target_arch=="ia32" and ' |
| 235 '(syzyasan==1 or syzygy_optimize==1)', { | 240 '(syzyasan==1 or syzygy_optimize==1)', { |
| 236 'dependencies': [ | 241 'dependencies': [ |
| 237 '../chrome/installer/mini_installer_syzygy.gyp:*', | 242 '../chrome/installer/mini_installer_syzygy.gyp:*', |
| (...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1196 'dependencies': [ | 1201 'dependencies': [ |
| 1197 '../base/base.gyp:base_unittests', | 1202 '../base/base.gyp:base_unittests', |
| 1198 '../ipc/ipc.gyp:ipc_tests', | 1203 '../ipc/ipc.gyp:ipc_tests', |
| 1199 '../sql/sql.gyp:sql_unittests', | 1204 '../sql/sql.gyp:sql_unittests', |
| 1200 '../sync/sync.gyp:sync_unit_tests', | 1205 '../sync/sync.gyp:sync_unit_tests', |
| 1201 ], | 1206 ], |
| 1202 }], | 1207 }], |
| 1203 ['chromeos==1', { | 1208 ['chromeos==1', { |
| 1204 'dependencies': [ | 1209 'dependencies': [ |
| 1205 '../chromeos/chromeos.gyp:chromeos_unittests', | 1210 '../chromeos/chromeos.gyp:chromeos_unittests', |
| 1211 '../athena/main/athena_main.gyp:*', |
| 1206 ], | 1212 ], |
| 1207 }], | 1213 }], |
| 1208 ['use_ozone==1', { | 1214 ['use_ozone==1', { |
| 1209 'dependencies!': [ | 1215 'dependencies!': [ |
| 1210 '../chrome/chrome.gyp:interactive_ui_tests', # crbug.com/362166 | 1216 '../chrome/chrome.gyp:interactive_ui_tests', # crbug.com/362166 |
| 1211 ], | 1217 ], |
| 1212 }], | 1218 }], |
| 1213 ], | 1219 ], |
| 1214 }, | 1220 }, |
| 1215 ], # targets | 1221 ], # targets |
| (...skipping 25 matching lines...) Expand all Loading... |
| 1241 # http://crbug.com/157234 | 1247 # http://crbug.com/157234 |
| 1242 #'../chrome/chrome.gyp:sync_integration_tests_run', | 1248 #'../chrome/chrome.gyp:sync_integration_tests_run', |
| 1243 '../chrome/chrome.gyp:unit_tests_run', | 1249 '../chrome/chrome.gyp:unit_tests_run', |
| 1244 '../net/net.gyp:net_unittests_run', | 1250 '../net/net.gyp:net_unittests_run', |
| 1245 ], | 1251 ], |
| 1246 }, # target_name: chromium_swarm_tests | 1252 }, # target_name: chromium_swarm_tests |
| 1247 ], | 1253 ], |
| 1248 }], | 1254 }], |
| 1249 ], # conditions | 1255 ], # conditions |
| 1250 } | 1256 } |
| OLD | NEW |