| 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 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 ], | 258 ], |
| 259 }, { # OS!="mac" | 259 }, { # OS!="mac" |
| 260 'sources/': [ | 260 'sources/': [ |
| 261 ['exclude', 'cocoa/'], | 261 ['exclude', 'cocoa/'], |
| 262 ], | 262 ], |
| 263 }], | 263 }], |
| 264 # See http://crbug.com/162998#c4 for why this is needed. | 264 # See http://crbug.com/162998#c4 for why this is needed. |
| 265 ['OS=="linux" and use_allocator!="none"', { | 265 ['OS=="linux" and use_allocator!="none"', { |
| 266 'dependencies': [ | 266 'dependencies': [ |
| 267 '../../base/allocator/allocator.gyp:allocator', | 267 '../../base/allocator/allocator.gyp:allocator', |
| 268 # The following two dependencies provide the missing | |
| 269 # symbol HeapProfilerStart in Linux component builds. | |
| 270 # They probably can be removed after http://crbug.com/263316 | |
| 271 '../../webkit/child/webkit_child.gyp:webkit_child', | |
| 272 ], | 268 ], |
| 273 }], | 269 }], |
| 274 ['OS=="win" and win_use_allocator_shim==1', { | 270 ['OS=="win" and win_use_allocator_shim==1', { |
| 275 'dependencies': [ | 271 'dependencies': [ |
| 276 '../../base/allocator/allocator.gyp:allocator', | 272 '../../base/allocator/allocator.gyp:allocator', |
| 277 ], | 273 ], |
| 278 }], | 274 }], |
| 279 ], | 275 ], |
| 280 # Disable c4267 warnings until we fix size_t to int truncations. | 276 # Disable c4267 warnings until we fix size_t to int truncations. |
| 281 'msvs_disabled_warnings': [ 4267, ], | 277 'msvs_disabled_warnings': [ 4267, ], |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 'dependencies': [ | 313 'dependencies': [ |
| 318 '../../sandbox/sandbox.gyp:sandbox', | 314 '../../sandbox/sandbox.gyp:sandbox', |
| 319 ], | 315 ], |
| 320 }], | 316 }], |
| 321 ], | 317 ], |
| 322 }, | 318 }, |
| 323 ], | 319 ], |
| 324 }], # toolkit_views==1 | 320 }], # toolkit_views==1 |
| 325 ], | 321 ], |
| 326 } | 322 } |
| OLD | NEW |