Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Side by Side Diff: components/test_runner/test_runner.gyp

Issue 1647453002: allocator cleanup: remove dependencies on allocator from all targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 'web_test_proxy.cc', 114 'web_test_proxy.cc',
115 'web_test_proxy.h', 115 'web_test_proxy.h',
116 'web_test_runner.h', 116 'web_test_runner.h',
117 ], 117 ],
118 'msvs_settings': { 118 'msvs_settings': {
119 'VCLinkerTool': { 119 'VCLinkerTool': {
120 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 120 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
121 }, 121 },
122 }, 122 },
123 'conditions': [ 123 'conditions': [
124 ['OS=="win" and win_use_allocator_shim==1', {
125 'dependencies': [
126 '../../base/allocator/allocator.gyp:allocator',
127 ],
128 }],
129 ['OS=="win"', { 124 ['OS=="win"', {
130 'configurations': { 125 'configurations': {
131 'Debug_Base': { 126 'Debug_Base': {
132 'msvs_settings': { 127 'msvs_settings': {
133 'VCLinkerTool': { 128 'VCLinkerTool': {
134 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 129 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
135 }, 130 },
136 }, 131 },
137 }, 132 },
138 }, 133 },
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', 199 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
205 ], 200 ],
206 }, 201 },
207 }], 202 }],
208 ], 203 ],
209 }, 204 },
210 ], 205 ],
211 }], # OS=="mac" or OS=="win" 206 }], # OS=="mac" or OS=="win"
212 ] 207 ]
213 } 208 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698