| 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 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 }], | 364 }], |
| 365 ['OS=="win" and component!="shared_library" and win_use_allocator_sh
im==1', { | 365 ['OS=="win" and component!="shared_library" and win_use_allocator_sh
im==1', { |
| 366 'dependencies': [ | 366 'dependencies': [ |
| 367 '<(DEPTH)/base/allocator/allocator.gyp:allocator', | 367 '<(DEPTH)/base/allocator/allocator.gyp:allocator', |
| 368 ], | 368 ], |
| 369 }], | 369 }], |
| 370 ], | 370 ], |
| 371 }, | 371 }, |
| 372 ], | 372 ], |
| 373 }], # toolkit_views==1 | 373 }], # toolkit_views==1 |
| 374 ['test_isolation_mode != "noop"', { |
| 375 'targets': [ |
| 376 { |
| 377 'target_name': 'app_list_unittests_run', |
| 378 'type': 'none', |
| 379 'dependencies': [ |
| 380 'app_list_unittests', |
| 381 ], |
| 382 'includes': [ |
| 383 '../../build/isolate.gypi', |
| 384 ], |
| 385 'sources': [ |
| 386 'app_list_unittests.isolate', |
| 387 ], |
| 388 'conditions': [ |
| 389 ['use_x11 == 1', { |
| 390 'dependencies': [ |
| 391 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 392 ], |
| 393 }], |
| 394 ], |
| 395 }, |
| 396 ], |
| 397 }], |
| 374 ], | 398 ], |
| 375 } | 399 } |
| OLD | NEW |