| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 # This turns on e.g. the filename-based detection of which | 7 # This turns on e.g. the filename-based detection of which |
| 8 # platforms to include source files on (e.g. files ending in | 8 # platforms to include source files on (e.g. files ending in |
| 9 # _mac.h or _mac.cc are only compiled on MacOSX). | 9 # _mac.h or _mac.cc are only compiled on MacOSX). |
| 10 'chromium_code': 1, | 10 'chromium_code': 1, |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 'web_test_proxy.cc', | 117 'web_test_proxy.cc', |
| 118 'web_test_proxy.h', | 118 'web_test_proxy.h', |
| 119 'web_test_runner.h', | 119 'web_test_runner.h', |
| 120 ], | 120 ], |
| 121 'msvs_settings': { | 121 'msvs_settings': { |
| 122 'VCLinkerTool': { | 122 'VCLinkerTool': { |
| 123 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 123 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
| 124 }, | 124 }, |
| 125 }, | 125 }, |
| 126 'conditions': [ | 126 'conditions': [ |
| 127 ['OS=="win" and win_use_allocator_shim==1', { | |
| 128 'dependencies': [ | |
| 129 '../../base/allocator/allocator.gyp:allocator', | |
| 130 ], | |
| 131 }], | |
| 132 ['OS=="win"', { | 127 ['OS=="win"', { |
| 133 'configurations': { | 128 'configurations': { |
| 134 'Debug_Base': { | 129 'Debug_Base': { |
| 135 'msvs_settings': { | 130 'msvs_settings': { |
| 136 'VCLinkerTool': { | 131 'VCLinkerTool': { |
| 137 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 132 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 138 }, | 133 }, |
| 139 }, | 134 }, |
| 140 }, | 135 }, |
| 141 }, | 136 }, |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', | 202 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', |
| 208 ], | 203 ], |
| 209 }, | 204 }, |
| 210 }], | 205 }], |
| 211 ], | 206 ], |
| 212 }, | 207 }, |
| 213 ], | 208 ], |
| 214 }], # OS=="mac" or OS=="win" | 209 }], # OS=="mac" or OS=="win" |
| 215 ] | 210 ] |
| 216 } | 211 } |
| OLD | NEW |