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

Side by Side Diff: net/net.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 | « media/media.gyp ('k') | ppapi/ppapi_tests.gypi » ('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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'use_tracing_cache_backend%': 0, 10 'use_tracing_cache_backend%': 0,
(...skipping 2183 matching lines...) Expand 10 before | Expand all | Expand 10 after
2194 ], 2194 ],
2195 }], 2195 }],
2196 [ 'toolkit_uses_gtk == 1', { 2196 [ 'toolkit_uses_gtk == 1', {
2197 'dependencies': [ 2197 'dependencies': [
2198 '../build/linux/system.gyp:gtk', 2198 '../build/linux/system.gyp:gtk',
2199 ], 2199 ],
2200 }, 2200 },
2201 ], 2201 ],
2202 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { 2202 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
2203 'conditions': [ 2203 'conditions': [
2204 ['linux_use_tcmalloc==1', { 2204 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
2205 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
2205 'dependencies': [ 2206 'dependencies': [
2206 '../base/allocator/allocator.gyp:allocator', 2207 '../base/allocator/allocator.gyp:allocator',
2207 ], 2208 ],
2208 }], 2209 }],
2209 ], 2210 ],
2210 }], 2211 }],
2211 [ 'use_kerberos==1', { 2212 [ 'use_kerberos==1', {
2212 'defines': [ 2213 'defines': [
2213 'USE_KERBEROS', 2214 'USE_KERBEROS',
2214 ], 2215 ],
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
2542 ], 2543 ],
2543 }, { 2544 }, {
2544 'dependencies': [ 2545 'dependencies': [
2545 '../build/linux/system.gyp:ssl', 2546 '../build/linux/system.gyp:ssl',
2546 ], 2547 ],
2547 }], 2548 }],
2548 ], 2549 ],
2549 }], 2550 }],
2550 ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { 2551 ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
2551 'conditions': [ 2552 'conditions': [
2552 ['linux_use_tcmalloc==1', { 2553 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
2554 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
2553 'dependencies': [ 2555 'dependencies': [
2554 '../base/allocator/allocator.gyp:allocator', 2556 '../base/allocator/allocator.gyp:allocator',
2555 ], 2557 ],
2556 }], 2558 }],
2557 ], 2559 ],
2558 }], 2560 }],
2559 ['OS != "android"', { 2561 ['OS != "android"', {
2560 'sources!': [ 2562 'sources!': [
2561 'test/spawned_test_server/remote_test_server.cc', 2563 'test/spawned_test_server/remote_test_server.cc',
2562 'test/spawned_test_server/remote_test_server.h', 2564 'test/spawned_test_server/remote_test_server.h',
(...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after
3238 'net_unittests.isolate', 3240 'net_unittests.isolate',
3239 ], 3241 ],
3240 'sources': [ 3242 'sources': [
3241 'net_unittests.isolate', 3243 'net_unittests.isolate',
3242 ], 3244 ],
3243 }, 3245 },
3244 ], 3246 ],
3245 }], 3247 }],
3246 ], 3248 ],
3247 } 3249 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | ppapi/ppapi_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698