| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 }], | 52 }], |
| 53 ['OS=="mac"', { | 53 ['OS=="mac"', { |
| 54 'link_settings': { | 54 'link_settings': { |
| 55 'libraries': [ | 55 'libraries': [ |
| 56 '$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework', | 56 '$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework', |
| 57 ], | 57 ], |
| 58 }, | 58 }, |
| 59 }], | 59 }], |
| 60 ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { | 60 ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { |
| 61 'conditions': [ | 61 'conditions': [ |
| 62 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 | 62 ['use_allocator!="none"', { |
| 63 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (
use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', { | |
| 64 'dependencies': [ | 63 'dependencies': [ |
| 65 '../base/allocator/allocator.gyp:allocator', | 64 '../base/allocator/allocator.gyp:allocator', |
| 66 ], | 65 ], |
| 67 }], | 66 }], |
| 68 ], | 67 ], |
| 69 }], | 68 }], |
| 70 ], | 69 ], |
| 71 }, | 70 }, |
| 72 ], | 71 ], |
| 73 } | 72 } |
| OLD | NEW |