| 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 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 'window_targeter_unittest.cc', | 305 'window_targeter_unittest.cc', |
| 306 'window_unittest.cc', | 306 'window_unittest.cc', |
| 307 ], | 307 ], |
| 308 'conditions': [ | 308 'conditions': [ |
| 309 # osmesa GL implementation is used on linux. | 309 # osmesa GL implementation is used on linux. |
| 310 ['OS=="linux"', { | 310 ['OS=="linux"', { |
| 311 'dependencies': [ | 311 'dependencies': [ |
| 312 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', | 312 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', |
| 313 ], | 313 ], |
| 314 }], | 314 }], |
| 315 ['OS=="linux" and use_allocator!="none"', { | |
| 316 'dependencies': [ | |
| 317 # See http://crbug.com/162998#c4 for why this is needed. | |
| 318 '../../base/allocator/allocator.gyp:allocator', | |
| 319 ], | |
| 320 }], | |
| 321 ], | 315 ], |
| 322 }, | 316 }, |
| 323 ], | 317 ], |
| 324 'conditions': [ | 318 'conditions': [ |
| 325 ['test_isolation_mode != "noop"', { | 319 ['test_isolation_mode != "noop"', { |
| 326 'targets': [ | 320 'targets': [ |
| 327 { | 321 { |
| 328 'target_name': 'aura_unittests_run', | 322 'target_name': 'aura_unittests_run', |
| 329 'type': 'none', | 323 'type': 'none', |
| 330 'dependencies': [ | 324 'dependencies': [ |
| (...skipping 10 matching lines...) Expand all Loading... |
| 341 'dependencies': [ | 335 'dependencies': [ |
| 342 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 336 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 343 ], | 337 ], |
| 344 }], | 338 }], |
| 345 ], | 339 ], |
| 346 }, | 340 }, |
| 347 ], | 341 ], |
| 348 }], | 342 }], |
| 349 ], | 343 ], |
| 350 } | 344 } |
| OLD | NEW |