| 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 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 379 }, | 379 }, |
| 380 ], | 380 ], |
| 381 }], # toolkit_views==1 | 381 }], # toolkit_views==1 |
| 382 ['test_isolation_mode != "noop"', { | 382 ['test_isolation_mode != "noop"', { |
| 383 'targets': [ | 383 'targets': [ |
| 384 { | 384 { |
| 385 'target_name': 'app_list_unittests_run', | 385 'target_name': 'app_list_unittests_run', |
| 386 'type': 'none', | 386 'type': 'none', |
| 387 'dependencies': [ | 387 'dependencies': [ |
| 388 'app_list_unittests', | 388 'app_list_unittests', |
| 389 '../../third_party/mesa/mesa.gyp:osmesa', |
| 389 ], | 390 ], |
| 390 'includes': [ | 391 'includes': [ |
| 391 '../../build/isolate.gypi', | 392 '../../build/isolate.gypi', |
| 392 ], | 393 ], |
| 393 'sources': [ | 394 'sources': [ |
| 394 'app_list_unittests.isolate', | 395 'app_list_unittests.isolate', |
| 395 ], | 396 ], |
| 396 'conditions': [ | 397 'conditions': [ |
| 397 ['use_x11 == 1', { | 398 ['use_x11 == 1', { |
| 398 'dependencies': [ | 399 'dependencies': [ |
| 399 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 400 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 400 ], | 401 ], |
| 401 }], | 402 }], |
| 402 ], | 403 ], |
| 403 }, | 404 }, |
| 404 ], | 405 ], |
| 405 }], | 406 }], |
| 406 ], | 407 ], |
| 407 } | 408 } |
| OLD | NEW |