| 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 'variables': { | 5 'variables': { |
| 6 'chromium_code': 1, | 6 'chromium_code': 1, |
| 7 }, | 7 }, |
| 8 'targets': [ | 8 'targets': [ |
| 9 { | 9 { |
| 10 'target_name': 'cloud_print', | 10 'target_name': 'cloud_print', |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 ['OS=="win"', { | 45 ['OS=="win"', { |
| 46 'sources': [ | 46 'sources': [ |
| 47 'service/win/service_ipc_unittest.cc', | 47 'service/win/service_ipc_unittest.cc', |
| 48 'virtual_driver/win/port_monitor/port_monitor_unittest.cc', | 48 'virtual_driver/win/port_monitor/port_monitor_unittest.cc', |
| 49 ], | 49 ], |
| 50 'dependencies': [ | 50 'dependencies': [ |
| 51 'virtual_driver/win/virtual_driver.gyp:gcp_portmon_lib', | 51 'virtual_driver/win/virtual_driver.gyp:gcp_portmon_lib', |
| 52 ], | 52 ], |
| 53 }], | 53 }], |
| 54 # See http://crbug.com/162998#c4 for why this is needed. | 54 # See http://crbug.com/162998#c4 for why this is needed. |
| 55 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 | 55 ['OS=="linux" and use_allocator!="none"', { |
| 56 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc
malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', { | |
| 57 'dependencies': [ | 56 'dependencies': [ |
| 58 '../base/allocator/allocator.gyp:allocator', | 57 '../base/allocator/allocator.gyp:allocator', |
| 59 ], | 58 ], |
| 60 }], | 59 }], |
| 61 ], | 60 ], |
| 62 'msvs_settings': { | 61 'msvs_settings': { |
| 63 'VCLinkerTool': { | 62 'VCLinkerTool': { |
| 64 'AdditionalDependencies': [ | 63 'AdditionalDependencies': [ |
| 65 'secur32.lib', | 64 'secur32.lib', |
| 66 ], | 65 ], |
| 67 }, | 66 }, |
| 68 }, | 67 }, |
| 69 }, | 68 }, |
| 70 ], | 69 ], |
| 71 } | 70 } |
| OLD | NEW |