| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 'conditions': [ | 125 'conditions': [ |
| 126 ['OS=="mac"', { | 126 ['OS=="mac"', { |
| 127 'sources/': [ | 127 'sources/': [ |
| 128 ['exclude', 'client/dispatcher_client.cc'], | 128 ['exclude', 'client/dispatcher_client.cc'], |
| 129 ['exclude', 'client/dispatcher_client.h'], | 129 ['exclude', 'client/dispatcher_client.h'], |
| 130 ], | 130 ], |
| 131 }], | 131 }], |
| 132 ['OS=="linux"', { | 132 ['OS=="linux"', { |
| 133 'link_settings': { | 133 'link_settings': { |
| 134 'libraries': [ | 134 'libraries': [ |
| 135 '-lX11', |
| 136 '-lXi', |
| 135 '-lXfixes', | 137 '-lXfixes', |
| 136 '-lXrandr', | 138 '-lXrandr', |
| 137 ], | 139 ], |
| 138 }, | 140 }, |
| 139 }], | 141 }], |
| 140 ], | 142 ], |
| 141 }, | 143 }, |
| 142 { | 144 { |
| 143 'target_name': 'test_support_aura', | 145 'target_name': 'test_support_aura', |
| 144 'type': 'static_library', | 146 'type': 'static_library', |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 # osmesa GL implementation is used on linux. | 287 # osmesa GL implementation is used on linux. |
| 286 ['OS=="linux"', { | 288 ['OS=="linux"', { |
| 287 'dependencies': [ | 289 'dependencies': [ |
| 288 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', | 290 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', |
| 289 ], | 291 ], |
| 290 }], | 292 }], |
| 291 ], | 293 ], |
| 292 }, | 294 }, |
| 293 ], | 295 ], |
| 294 } | 296 } |
| OLD | NEW |