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

Side by Side Diff: ipc/ipc.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 | « gpu/gpu.gyp ('k') | media/media.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 'includes': [ 9 'includes': [
10 'ipc.gypi', 10 'ipc.gypi',
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 'unix_domain_socket_util_unittest.cc', 72 'unix_domain_socket_util_unittest.cc',
73 ], 73 ],
74 }], 74 }],
75 ['OS == "android" and gtest_target_type == "shared_library"', { 75 ['OS == "android" and gtest_target_type == "shared_library"', {
76 'dependencies': [ 76 'dependencies': [
77 '../testing/android/native_test.gyp:native_test_native_code', 77 '../testing/android/native_test.gyp:native_test_native_code',
78 ], 78 ],
79 }], 79 }],
80 ['os_posix == 1 and OS != "mac" and OS != "android"', { 80 ['os_posix == 1 and OS != "mac" and OS != "android"', {
81 'conditions': [ 81 'conditions': [
82 ['linux_use_tcmalloc==1', { 82 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
83 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
83 'dependencies': [ 84 'dependencies': [
84 '../base/allocator/allocator.gyp:allocator', 85 '../base/allocator/allocator.gyp:allocator',
85 ], 86 ],
86 }], 87 }],
87 ], 88 ],
88 }] 89 }]
89 ], 90 ],
90 }, 91 },
91 { 92 {
92 'target_name': 'ipc_perftests', 93 'target_name': 'ipc_perftests',
(...skipping 22 matching lines...) Expand all
115 '../build/linux/system.gyp:gtk', 116 '../build/linux/system.gyp:gtk',
116 ], 117 ],
117 }], 118 }],
118 ['OS == "android" and gtest_target_type == "shared_library"', { 119 ['OS == "android" and gtest_target_type == "shared_library"', {
119 'dependencies': [ 120 'dependencies': [
120 '../testing/android/native_test.gyp:native_test_native_code', 121 '../testing/android/native_test.gyp:native_test_native_code',
121 ], 122 ],
122 }], 123 }],
123 ['os_posix == 1 and OS != "mac" and OS != "android"', { 124 ['os_posix == 1 and OS != "mac" and OS != "android"', {
124 'conditions': [ 125 'conditions': [
125 ['linux_use_tcmalloc==1', { 126 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
127 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
126 'dependencies': [ 128 'dependencies': [
127 '../base/allocator/allocator.gyp:allocator', 129 '../base/allocator/allocator.gyp:allocator',
128 ], 130 ],
129 }], 131 }],
130 ], 132 ],
131 }] 133 }]
132 ], 134 ],
133 }, 135 },
134 { 136 {
135 'target_name': 'test_support_ipc', 137 'target_name': 'test_support_ipc',
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 ], 192 ],
191 'variables': { 193 'variables': {
192 'test_suite_name': 'ipc_tests', 194 'test_suite_name': 'ipc_tests',
193 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ipc_tests <(SHARED_LIB_SUFFIX)', 195 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ipc_tests <(SHARED_LIB_SUFFIX)',
194 }, 196 },
195 'includes': [ '../build/apk_test.gypi' ], 197 'includes': [ '../build/apk_test.gypi' ],
196 }], 198 }],
197 }], 199 }],
198 ], 200 ],
199 } 201 }
OLDNEW
« no previous file with comments | « gpu/gpu.gyp ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698