| 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 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 'conditions': [ | 83 'conditions': [ |
| 84 ['use_aura==1', { | 84 ['use_aura==1', { |
| 85 'dependencies': [ | 85 'dependencies': [ |
| 86 '../../base/base.gyp:test_support_base', | 86 '../../base/base.gyp:test_support_base', |
| 87 '../aura/aura.gyp:aura_test_support', | 87 '../aura/aura.gyp:aura_test_support', |
| 88 '../compositor/compositor.gyp:compositor', | 88 '../compositor/compositor.gyp:compositor', |
| 89 '../compositor/compositor.gyp:compositor_test_support', | 89 '../compositor/compositor.gyp:compositor_test_support', |
| 90 '../wm/wm.gyp:wm', | 90 '../wm/wm.gyp:wm', |
| 91 ], | 91 ], |
| 92 }], | 92 }], |
| 93 # See http://crbug.com/162998#c4 for why this is needed. | |
| 94 ['OS=="linux" and use_allocator!="none"', { | |
| 95 'dependencies': [ | |
| 96 '../../base/allocator/allocator.gyp:allocator', | |
| 97 ], | |
| 98 }], | |
| 99 ], | 93 ], |
| 100 }, | 94 }, |
| 101 ], | 95 ], |
| 102 } | 96 } |
| OLD | NEW |