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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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', { | 228 ['chromeos==1', { |
229 'dependencies': [ | 229 'dependencies': [ |
230 '../athena/main/athena_main.gyp:*', | 230 '../athena/main/athena_main.gyp:*', |
| 231 '../athena/ui/athena_ui_main.gyp:*', |
231 ], | 232 ], |
232 }], | 233 }], |
233 ], | 234 ], |
234 }, # target_name: All | 235 }, # target_name: All |
235 { | 236 { |
236 'target_name': 'All_syzygy', | 237 'target_name': 'All_syzygy', |
237 'type': 'none', | 238 'type': 'none', |
238 'conditions': [ | 239 'conditions': [ |
239 ['OS=="win" and fastbuild==0 and target_arch=="ia32" and ' | 240 ['OS=="win" and fastbuild==0 and target_arch=="ia32" and ' |
240 '(syzyasan==1 or syzygy_optimize==1)', { | 241 '(syzyasan==1 or syzygy_optimize==1)', { |
(...skipping 985 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1226 # http://crbug.com/157234 | 1227 # http://crbug.com/157234 |
1227 #'../chrome/chrome.gyp:sync_integration_tests_run', | 1228 #'../chrome/chrome.gyp:sync_integration_tests_run', |
1228 '../chrome/chrome.gyp:unit_tests_run', | 1229 '../chrome/chrome.gyp:unit_tests_run', |
1229 '../net/net.gyp:net_unittests_run', | 1230 '../net/net.gyp:net_unittests_run', |
1230 ], | 1231 ], |
1231 }, # target_name: chromium_swarm_tests | 1232 }, # target_name: chromium_swarm_tests |
1232 ], | 1233 ], |
1233 }], | 1234 }], |
1234 ], # conditions | 1235 ], # conditions |
1235 } | 1236 } |
OLD | NEW |