| 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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 '../base/strings/ui_strings.gyp:ui_unittest_strings', | 231 '../base/strings/ui_strings.gyp:ui_unittest_strings', |
| 232 ], | 232 ], |
| 233 }], | 233 }], |
| 234 # See http://crbug.com/162998#c4 for why this is needed. | 234 # See http://crbug.com/162998#c4 for why this is needed. |
| 235 ['OS=="linux" and linux_use_tcmalloc==1', { | 235 ['OS=="linux" and linux_use_tcmalloc==1', { |
| 236 'dependencies': [ | 236 'dependencies': [ |
| 237 '../../base/allocator/allocator.gyp:allocator', | 237 '../../base/allocator/allocator.gyp:allocator', |
| 238 # The following two dependencies provide the missing | 238 # The following two dependencies provide the missing |
| 239 # symbol HeapProfilerStart in Linux component builds. | 239 # symbol HeapProfilerStart in Linux component builds. |
| 240 # They probably can be removed after http://crbug.com/263316 | 240 # They probably can be removed after http://crbug.com/263316 |
| 241 '../../webkit/child/webkit_child.gyp:webkit_child', |
| 241 '../../webkit/glue/webkit_glue.gyp:glue', | 242 '../../webkit/glue/webkit_glue.gyp:glue', |
| 242 '../../webkit/glue/webkit_glue.gyp:glue_child', | |
| 243 ], | 243 ], |
| 244 }], | 244 }], |
| 245 ], | 245 ], |
| 246 # Disable c4267 warnings until we fix size_t to int truncations. | 246 # Disable c4267 warnings until we fix size_t to int truncations. |
| 247 'msvs_disabled_warnings': [ 4267, ], | 247 'msvs_disabled_warnings': [ 4267, ], |
| 248 }, | 248 }, |
| 249 ], | 249 ], |
| 250 } | 250 } |
| OLD | NEW |