| OLD | NEW |
| 1 # Copyright 2012 The Chromium Authors. All rights reserved. | 1 # Copyright 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 'targets': [ | 5 'targets': [ |
| 6 { | 6 { |
| 7 # This target contains mocks and test utilities that don't belong in | 7 # This target contains mocks and test utilities that don't belong in |
| 8 # production libraries but are used by more than one test executable. | 8 # production libraries but are used by more than one test executable. |
| 9 'target_name': 'test_support_common', | 9 'target_name': 'test_support_common', |
| 10 'type': 'static_library', | 10 'type': 'static_library', |
| (...skipping 2441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2452 'LinkIncremental': '<(msvs_debug_link_nonincremental)', | 2452 'LinkIncremental': '<(msvs_debug_link_nonincremental)', |
| 2453 }, | 2453 }, |
| 2454 }, | 2454 }, |
| 2455 }, | 2455 }, |
| 2456 }, | 2456 }, |
| 2457 }], | 2457 }], |
| 2458 ['OS=="win"', { | 2458 ['OS=="win"', { |
| 2459 'dependencies': [ | 2459 'dependencies': [ |
| 2460 'chrome_version_resources', | 2460 'chrome_version_resources', |
| 2461 'installer_util_strings', | 2461 'installer_util_strings', |
| 2462 '../chrome_elf/chrome_elf.gyp:blacklist_test_dll_1', |
| 2462 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', | 2463 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', |
| 2463 '../third_party/isimpledom/isimpledom.gyp:isimpledom', | 2464 '../third_party/isimpledom/isimpledom.gyp:isimpledom', |
| 2464 ], | 2465 ], |
| 2465 'conditions': [ | 2466 'conditions': [ |
| 2466 ['win_use_allocator_shim==1', { | 2467 ['win_use_allocator_shim==1', { |
| 2467 'dependencies': [ | 2468 'dependencies': [ |
| 2468 '<(allocator_target)', | 2469 '<(allocator_target)', |
| 2469 ], | 2470 ], |
| 2470 }], | 2471 }], |
| 2471 ], | 2472 ], |
| (...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2870 'dependencies': [ | 2871 'dependencies': [ |
| 2871 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2872 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 2872 ], | 2873 ], |
| 2873 }], | 2874 }], |
| 2874 ], | 2875 ], |
| 2875 }, | 2876 }, |
| 2876 ], | 2877 ], |
| 2877 }], | 2878 }], |
| 2878 ], # 'conditions' | 2879 ], # 'conditions' |
| 2879 } | 2880 } |
| OLD | NEW |