| 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'. | 8 # compilation targets to 'All'. |
| 9 'app_targets%': [], | 9 'app_targets%': [], |
| 10 # For Android-specific targets. | 10 # For Android-specific targets. |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 'dependencies': [ | 208 'dependencies': [ |
| 209 '../chromecast/chromecast.gyp:*', | 209 '../chromecast/chromecast.gyp:*', |
| 210 ], | 210 ], |
| 211 }], | 211 }], |
| 212 ['use_x11==1', { | 212 ['use_x11==1', { |
| 213 'dependencies': [ | 213 'dependencies': [ |
| 214 '../tools/xdisplaycheck/xdisplaycheck.gyp:*', | 214 '../tools/xdisplaycheck/xdisplaycheck.gyp:*', |
| 215 ], | 215 ], |
| 216 }], | 216 }], |
| 217 ['OS=="win"', { | 217 ['OS=="win"', { |
| 218 'conditions': [ | |
| 219 ['win_use_allocator_shim==1', { | |
| 220 'dependencies': [ | |
| 221 '../base/allocator/allocator.gyp:*', | |
| 222 ], | |
| 223 }], | |
| 224 ], | |
| 225 'dependencies': [ | 218 'dependencies': [ |
| 226 '../chrome/tools/crash_service/caps/caps.gyp:*', | 219 '../chrome/tools/crash_service/caps/caps.gyp:*', |
| 227 '../chrome_elf/chrome_elf.gyp:*', | 220 '../chrome_elf/chrome_elf.gyp:*', |
| 228 '../cloud_print/cloud_print.gyp:*', | 221 '../cloud_print/cloud_print.gyp:*', |
| 229 '../courgette/courgette.gyp:*', | 222 '../courgette/courgette.gyp:*', |
| 230 '../rlz/rlz.gyp:*', | 223 '../rlz/rlz.gyp:*', |
| 231 '../sandbox/sandbox.gyp:*', | 224 '../sandbox/sandbox.gyp:*', |
| 232 '<(angle_path)/src/angle.gyp:*', | 225 '<(angle_path)/src/angle.gyp:*', |
| 233 '../third_party/bspatch/bspatch.gyp:*', | 226 '../third_party/bspatch/bspatch.gyp:*', |
| 234 '../tools/win/static_initializers/static_initializers.gyp:*', | 227 '../tools/win/static_initializers/static_initializers.gyp:*', |
| (...skipping 1206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1441 'dependencies': [ | 1434 'dependencies': [ |
| 1442 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 1435 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', |
| 1443 '../ui/views/views.gyp:views', | 1436 '../ui/views/views.gyp:views', |
| 1444 '../ui/views/views.gyp:views_unittests', | 1437 '../ui/views/views.gyp:views_unittests', |
| 1445 ], | 1438 ], |
| 1446 }, # target_name: macviews_builder | 1439 }, # target_name: macviews_builder |
| 1447 ], # targets | 1440 ], # targets |
| 1448 }], # os=='mac' and toolkit_views==1 | 1441 }], # os=='mac' and toolkit_views==1 |
| 1449 ], # conditions | 1442 ], # conditions |
| 1450 } | 1443 } |
| OLD | NEW |