| 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 2494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2505 'msvs_settings': { | 2505 'msvs_settings': { |
| 2506 'VCLinkerTool': { | 2506 'VCLinkerTool': { |
| 2507 'LinkIncremental': '<(msvs_debug_link_nonincremental)', | 2507 'LinkIncremental': '<(msvs_debug_link_nonincremental)', |
| 2508 }, | 2508 }, |
| 2509 }, | 2509 }, |
| 2510 }, | 2510 }, |
| 2511 }, | 2511 }, |
| 2512 }], | 2512 }], |
| 2513 ['OS=="win"', { | 2513 ['OS=="win"', { |
| 2514 'dependencies': [ | 2514 'dependencies': [ |
| 2515 'browser/safe_browsing/verifier_test/verifier_unittest.gyp:verifier_
test_dll', | 2515 'browser/safe_browsing/verifier_test/verifier_unittest.gyp:verifier_
test_dll_1', |
| 2516 'browser/safe_browsing/verifier_test/verifier_unittest.gyp:verifier_
test_dll_2', |
| 2516 'chrome_version_resources', | 2517 'chrome_version_resources', |
| 2517 'installer_util_strings', | 2518 'installer_util_strings', |
| 2518 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', | 2519 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', |
| 2519 '../third_party/isimpledom/isimpledom.gyp:isimpledom', | 2520 '../third_party/isimpledom/isimpledom.gyp:isimpledom', |
| 2520 ], | 2521 ], |
| 2521 'conditions': [ | 2522 'conditions': [ |
| 2522 ['win_use_allocator_shim==1', { | 2523 ['win_use_allocator_shim==1', { |
| 2523 'dependencies': [ | 2524 'dependencies': [ |
| 2524 '<(allocator_target)', | 2525 '<(allocator_target)', |
| 2525 ], | 2526 ], |
| (...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2931 'dependencies': [ | 2932 'dependencies': [ |
| 2932 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2933 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 2933 ], | 2934 ], |
| 2934 }], | 2935 }], |
| 2935 ], | 2936 ], |
| 2936 }, | 2937 }, |
| 2937 ], | 2938 ], |
| 2938 }], | 2939 }], |
| 2939 ], # 'conditions' | 2940 ], # 'conditions' |
| 2940 } | 2941 } |
| OLD | NEW |