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

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

Powered by Google App Engine
This is Rietveld 408576698