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

Side by Side Diff: device/device_tests.gyp

Issue 177353002: Add use_allocator instead of linux_use_tcmalloc to switch the allocator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « crypto/crypto.gyp ('k') | gpu/gles2_conform_support/gles2_conform_support.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 }], 49 }],
50 ['OS=="mac"', { 50 ['OS=="mac"', {
51 'link_settings': { 51 'link_settings': {
52 'libraries': [ 52 'libraries': [
53 '$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework', 53 '$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework',
54 ], 54 ],
55 }, 55 },
56 }], 56 }],
57 ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { 57 ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
58 'conditions': [ 58 'conditions': [
59 ['linux_use_tcmalloc == 1', { 59 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
60 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
60 'dependencies': [ 61 'dependencies': [
61 '../base/allocator/allocator.gyp:allocator', 62 '../base/allocator/allocator.gyp:allocator',
62 ], 63 ],
63 }], 64 }],
64 ], 65 ],
65 }], 66 }],
66 ], 67 ],
67 }, 68 },
68 ], 69 ],
69 } 70 }
OLDNEW
« no previous file with comments | « crypto/crypto.gyp ('k') | gpu/gles2_conform_support/gles2_conform_support.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698