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

Side by Side Diff: chrome/chrome_tests.gypi

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 | « chrome/chrome_exe.gypi ('k') | chrome/chrome_tests_unit.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 'variables' : { 5 'variables' : {
6 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
(...skipping 1953 matching lines...) Expand 10 before | Expand all | Expand 10 after
1964 ], 1964 ],
1965 }], 1965 }],
1966 ['OS=="android"', { 1966 ['OS=="android"', {
1967 'sources!': [ 1967 'sources!': [
1968 'browser/policy/cloud/component_cloud_policy_browsertest.cc', 1968 'browser/policy/cloud/component_cloud_policy_browsertest.cc',
1969 'browser/prefs/pref_hash_browsertest.cc', 1969 'browser/prefs/pref_hash_browsertest.cc',
1970 ], 1970 ],
1971 }], 1971 }],
1972 ['os_posix == 1 and OS != "mac" and OS != "android"', { 1972 ['os_posix == 1 and OS != "mac" and OS != "android"', {
1973 'conditions': [ 1973 'conditions': [
1974 ['linux_use_tcmalloc==1', { 1974 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
1975 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
1975 'dependencies': [ 1976 'dependencies': [
1976 '../base/allocator/allocator.gyp:allocator', 1977 '../base/allocator/allocator.gyp:allocator',
1977 ], 1978 ],
1978 }], 1979 }],
1979 ], 1980 ],
1980 }], 1981 }],
1981 ['chromeos == 1 or OS=="win" or OS == "mac"', { 1982 ['chromeos == 1 or OS=="win" or OS == "mac"', {
1982 'sources': [ 1983 'sources': [
1983 'browser/extensions/api/networking_private/networking_private_apites t.cc', 1984 'browser/extensions/api/networking_private/networking_private_apites t.cc',
1984 ], 1985 ],
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
2209 # Other platforms only need 2210 # Other platforms only need
2210 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, 2211 # chrome_resources.gyp:{packed_extra_resources,packed_resources},
2211 # and can build this target standalone much faster. 2212 # and can build this target standalone much faster.
2212 'dependencies': [ 2213 'dependencies': [
2213 'chrome', 2214 'chrome',
2214 '../components/components.gyp:breakpad_stubs', 2215 '../components/components.gyp:breakpad_stubs',
2215 ], 2216 ],
2216 }], 2217 }],
2217 ['os_posix == 1 and OS != "mac" and OS != "android"', { 2218 ['os_posix == 1 and OS != "mac" and OS != "android"', {
2218 'conditions': [ 2219 'conditions': [
2219 ['linux_use_tcmalloc==1', { 2220 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
2221 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
2220 'dependencies': [ 2222 'dependencies': [
2221 '../base/allocator/allocator.gyp:allocator', 2223 '../base/allocator/allocator.gyp:allocator',
2222 ], 2224 ],
2223 }], 2225 }],
2224 ], 2226 ],
2225 }], 2227 }],
2226 ], # conditions 2228 ], # conditions
2227 }, # target performance_browser_tests 2229 }, # target performance_browser_tests
2228 { 2230 {
2229 'target_name': 'performance_ui_tests', 2231 'target_name': 'performance_ui_tests',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
2298 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2300 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2299 ], 2301 ],
2300 }], 2302 }],
2301 ['toolkit_uses_gtk == 1', { 2303 ['toolkit_uses_gtk == 1', {
2302 'dependencies': [ 2304 'dependencies': [
2303 '../build/linux/system.gyp:gtk', 2305 '../build/linux/system.gyp:gtk',
2304 ], 2306 ],
2305 }], 2307 }],
2306 ['os_posix == 1 and OS != "mac" and OS != "android"', { 2308 ['os_posix == 1 and OS != "mac" and OS != "android"', {
2307 'conditions': [ 2309 'conditions': [
2308 ['linux_use_tcmalloc==1', { 2310 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
2311 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
2309 'dependencies': [ 2312 'dependencies': [
2310 '../base/allocator/allocator.gyp:allocator', 2313 '../base/allocator/allocator.gyp:allocator',
2311 ], 2314 ],
2312 }], 2315 }],
2313 ], 2316 ],
2314 }], 2317 }],
2315 ['toolkit_views==1', { 2318 ['toolkit_views==1', {
2316 'dependencies': [ 2319 'dependencies': [
2317 '../ui/views/views.gyp:views', 2320 '../ui/views/views.gyp:views',
2318 ], 2321 ],
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
2920 }], 2923 }],
2921 ], 2924 ],
2922 }], 2925 }],
2923 ['toolkit_views==1', { 2926 ['toolkit_views==1', {
2924 'dependencies': [ 2927 'dependencies': [
2925 '../ui/views/views.gyp:views', 2928 '../ui/views/views.gyp:views',
2926 ], 2929 ],
2927 }], 2930 }],
2928 ['os_posix == 1 and OS != "mac" and OS != "android"', { 2931 ['os_posix == 1 and OS != "mac" and OS != "android"', {
2929 'conditions': [ 2932 'conditions': [
2930 ['linux_use_tcmalloc==1', { 2933 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345 554
2934 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
2931 'dependencies': [ 2935 'dependencies': [
2932 '../base/allocator/allocator.gyp:allocator', 2936 '../base/allocator/allocator.gyp:allocator',
2933 ], 2937 ],
2934 }], 2938 }],
2935 ], 2939 ],
2936 }], 2940 }],
2937 ['OS=="linux" and enable_webrtc==1', { 2941 ['OS=="linux" and enable_webrtc==1', {
2938 'dependencies': [ 2942 'dependencies': [
2939 '../third_party/libjingle/libjingle.gyp:libpeerconnection', 2943 '../third_party/libjingle/libjingle.gyp:libpeerconnection',
2940 ], 2944 ],
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
3209 'utility', 3213 'utility',
3210 ], 3214 ],
3211 'sources': [ 3215 'sources': [
3212 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3216 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3213 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3217 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3214 ], 3218 ],
3215 }] 3219 }]
3216 }], 3220 }],
3217 ], # 'conditions' 3221 ], # 'conditions'
3218 } 3222 }
OLDNEW
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698