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

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
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 1966 matching lines...) Expand 10 before | Expand all | Expand 10 after
1977 ], 1977 ],
1978 }], 1978 }],
1979 ['OS=="android"', { 1979 ['OS=="android"', {
1980 'sources!': [ 1980 'sources!': [
1981 'browser/policy/cloud/component_cloud_policy_browsertest.cc', 1981 'browser/policy/cloud/component_cloud_policy_browsertest.cc',
1982 'browser/prefs/pref_hash_browsertest.cc', 1982 'browser/prefs/pref_hash_browsertest.cc',
1983 ], 1983 ],
1984 }], 1984 }],
1985 ['os_posix == 1 and OS != "mac" and OS != "android"', { 1985 ['os_posix == 1 and OS != "mac" and OS != "android"', {
1986 'conditions': [ 1986 'conditions': [
1987 ['linux_use_tcmalloc==1', { 1987 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
1988 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
1988 'dependencies': [ 1989 'dependencies': [
1989 '../base/allocator/allocator.gyp:allocator', 1990 '../base/allocator/allocator.gyp:allocator',
1990 ], 1991 ],
1991 }], 1992 }],
1992 ], 1993 ],
1993 }], 1994 }],
1994 ['chromeos == 1 or OS=="win" or OS == "mac"', { 1995 ['chromeos == 1 or OS=="win" or OS == "mac"', {
1995 'sources': [ 1996 'sources': [
1996 'browser/extensions/api/networking_private/networking_private_apites t.cc', 1997 'browser/extensions/api/networking_private/networking_private_apites t.cc',
1997 ], 1998 ],
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
2222 # Other platforms only need 2223 # Other platforms only need
2223 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, 2224 # chrome_resources.gyp:{packed_extra_resources,packed_resources},
2224 # and can build this target standalone much faster. 2225 # and can build this target standalone much faster.
2225 'dependencies': [ 2226 'dependencies': [
2226 'chrome', 2227 'chrome',
2227 '../components/components.gyp:breakpad_stubs', 2228 '../components/components.gyp:breakpad_stubs',
2228 ], 2229 ],
2229 }], 2230 }],
2230 ['os_posix == 1 and OS != "mac" and OS != "android"', { 2231 ['os_posix == 1 and OS != "mac" and OS != "android"', {
2231 'conditions': [ 2232 'conditions': [
2232 ['linux_use_tcmalloc==1', { 2233 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
2234 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
2233 'dependencies': [ 2235 'dependencies': [
2234 '../base/allocator/allocator.gyp:allocator', 2236 '../base/allocator/allocator.gyp:allocator',
2235 ], 2237 ],
2236 }], 2238 }],
2237 ], 2239 ],
2238 }], 2240 }],
2239 ], # conditions 2241 ], # conditions
2240 }, # target performance_browser_tests 2242 }, # target performance_browser_tests
2241 { 2243 {
2242 'target_name': 'performance_ui_tests', 2244 'target_name': 'performance_ui_tests',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
2311 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2313 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2312 ], 2314 ],
2313 }], 2315 }],
2314 ['toolkit_uses_gtk == 1', { 2316 ['toolkit_uses_gtk == 1', {
2315 'dependencies': [ 2317 'dependencies': [
2316 '../build/linux/system.gyp:gtk', 2318 '../build/linux/system.gyp:gtk',
2317 ], 2319 ],
2318 }], 2320 }],
2319 ['os_posix == 1 and OS != "mac" and OS != "android"', { 2321 ['os_posix == 1 and OS != "mac" and OS != "android"', {
2320 'conditions': [ 2322 'conditions': [
2321 ['linux_use_tcmalloc==1', { 2323 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
2324 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
2322 'dependencies': [ 2325 'dependencies': [
2323 '../base/allocator/allocator.gyp:allocator', 2326 '../base/allocator/allocator.gyp:allocator',
2324 ], 2327 ],
2325 }], 2328 }],
2326 ], 2329 ],
2327 }], 2330 }],
2328 ['toolkit_views==1', { 2331 ['toolkit_views==1', {
2329 'dependencies': [ 2332 'dependencies': [
2330 '../ui/views/views.gyp:views', 2333 '../ui/views/views.gyp:views',
2331 ], 2334 ],
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
2915 }], 2918 }],
2916 ], 2919 ],
2917 }], 2920 }],
2918 ['toolkit_views==1', { 2921 ['toolkit_views==1', {
2919 'dependencies': [ 2922 'dependencies': [
2920 '../ui/views/views.gyp:views', 2923 '../ui/views/views.gyp:views',
2921 ], 2924 ],
2922 }], 2925 }],
2923 ['os_posix == 1 and OS != "mac" and OS != "android"', { 2926 ['os_posix == 1 and OS != "mac" and OS != "android"', {
2924 'conditions': [ 2927 'conditions': [
2925 ['linux_use_tcmalloc==1', { 2928 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345 554
2929 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
2926 'dependencies': [ 2930 'dependencies': [
2927 '../base/allocator/allocator.gyp:allocator', 2931 '../base/allocator/allocator.gyp:allocator',
2928 ], 2932 ],
2929 }], 2933 }],
2930 ], 2934 ],
2931 }], 2935 }],
2932 ['OS=="linux" and enable_webrtc==1', { 2936 ['OS=="linux" and enable_webrtc==1', {
2933 'dependencies': [ 2937 'dependencies': [
2934 '../third_party/libjingle/libjingle.gyp:libpeerconnection', 2938 '../third_party/libjingle/libjingle.gyp:libpeerconnection',
2935 ], 2939 ],
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
3204 'utility', 3208 'utility',
3205 ], 3209 ],
3206 'sources': [ 3210 'sources': [
3207 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3211 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3208 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3212 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3209 ], 3213 ],
3210 }] 3214 }]
3211 }], 3215 }],
3212 ], # 'conditions' 3216 ], # 'conditions'
3213 } 3217 }
OLDNEW
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | ui/keyboard/keyboard.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698