| 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 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'All', | 8 'target_name': 'All', |
| 9 'type': 'none', | 9 'type': 'none', |
| 10 'xcode_create_dependents_test_runner': 1, | 10 'xcode_create_dependents_test_runner': 1, |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 '../sandbox/sandbox.gyp:*', | 83 '../sandbox/sandbox.gyp:*', |
| 84 ], | 84 ], |
| 85 'conditions': [ | 85 'conditions': [ |
| 86 ['branding=="Chrome"', { | 86 ['branding=="Chrome"', { |
| 87 'dependencies': [ | 87 'dependencies': [ |
| 88 '../chrome/chrome.gyp:linux_packages_<(channel)', | 88 '../chrome/chrome.gyp:linux_packages_<(channel)', |
| 89 ], | 89 ], |
| 90 }], | 90 }], |
| 91 ], | 91 ], |
| 92 }], | 92 }], |
| 93 ['use_wayland==1', { | |
| 94 'dependencies': [ | |
| 95 '../ui/wayland/wayland.gyp:*', | |
| 96 ], | |
| 97 }], | |
| 98 ['toolkit_uses_gtk==1', { | 93 ['toolkit_uses_gtk==1', { |
| 99 'dependencies': [ | 94 'dependencies': [ |
| 100 '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*', | 95 '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*', |
| 101 '../tools/xdisplaycheck/xdisplaycheck.gyp:*', | 96 '../tools/xdisplaycheck/xdisplaycheck.gyp:*', |
| 102 ], | 97 ], |
| 103 }], | 98 }], |
| 104 ['OS=="win"', { | 99 ['OS=="win"', { |
| 105 'conditions': [ | 100 'conditions': [ |
| 106 ['win_use_allocator_shim==1', { | 101 ['win_use_allocator_shim==1', { |
| 107 'dependencies': [ | 102 'dependencies': [ |
| (...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 602 'dependencies': [ | 597 'dependencies': [ |
| 603 '../chromeos/chromeos.gyp:chromeos_unittests', | 598 '../chromeos/chromeos.gyp:chromeos_unittests', |
| 604 ], | 599 ], |
| 605 }], | 600 }], |
| 606 ], | 601 ], |
| 607 }, | 602 }, |
| 608 ], # targets | 603 ], # targets |
| 609 }], # "use_aura==1" | 604 }], # "use_aura==1" |
| 610 ], # conditions | 605 ], # conditions |
| 611 } | 606 } |
| OLD | NEW |