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

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: 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 'variables' : { 5 'variables' : {
6 'chromedriver_unittest_sources': [ 6 'chromedriver_unittest_sources': [
7 'test/chromedriver/capabilities_unittest.cc', 7 'test/chromedriver/capabilities_unittest.cc',
8 'test/chromedriver/chrome/chrome_finder_unittest.cc', 8 'test/chromedriver/chrome/chrome_finder_unittest.cc',
9 'test/chromedriver/chrome/console_logger_unittest.cc', 9 'test/chromedriver/chrome/console_logger_unittest.cc',
10 'test/chromedriver/chrome/device_manager_unittest.cc', 10 'test/chromedriver/chrome/device_manager_unittest.cc',
(...skipping 1993 matching lines...) Expand 10 before | Expand all | Expand 10 after
2004 ], 2004 ],
2005 }], 2005 }],
2006 ['OS=="android"', { 2006 ['OS=="android"', {
2007 'sources!': [ 2007 'sources!': [
2008 'browser/policy/cloud/component_cloud_policy_browsertest.cc', 2008 'browser/policy/cloud/component_cloud_policy_browsertest.cc',
2009 'browser/prefs/pref_hash_browsertest.cc', 2009 'browser/prefs/pref_hash_browsertest.cc',
2010 ], 2010 ],
2011 }], 2011 }],
2012 ['os_posix == 1 and OS != "mac" and OS != "android"', { 2012 ['os_posix == 1 and OS != "mac" and OS != "android"', {
2013 'conditions': [ 2013 'conditions': [
2014 ['linux_use_tcmalloc==1', { 2014 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
2015 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
2015 'dependencies': [ 2016 'dependencies': [
2016 '../base/allocator/allocator.gyp:allocator', 2017 '../base/allocator/allocator.gyp:allocator',
2017 ], 2018 ],
2018 }], 2019 }],
2019 ], 2020 ],
2020 }], 2021 }],
2021 ['chromeos == 1 or OS=="win" or OS == "mac"', { 2022 ['chromeos == 1 or OS=="win" or OS == "mac"', {
2022 'sources': [ 2023 'sources': [
2023 'browser/extensions/api/networking_private/networking_private_apites t.cc', 2024 'browser/extensions/api/networking_private/networking_private_apites t.cc',
2024 ], 2025 ],
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
2249 # Other platforms only need 2250 # Other platforms only need
2250 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, 2251 # chrome_resources.gyp:{packed_extra_resources,packed_resources},
2251 # and can build this target standalone much faster. 2252 # and can build this target standalone much faster.
2252 'dependencies': [ 2253 'dependencies': [
2253 'chrome', 2254 'chrome',
2254 '../components/components.gyp:breakpad_stubs', 2255 '../components/components.gyp:breakpad_stubs',
2255 ], 2256 ],
2256 }], 2257 }],
2257 ['os_posix == 1 and OS != "mac" and OS != "android"', { 2258 ['os_posix == 1 and OS != "mac" and OS != "android"', {
2258 'conditions': [ 2259 'conditions': [
2259 ['linux_use_tcmalloc==1', { 2260 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
2261 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
2260 'dependencies': [ 2262 'dependencies': [
2261 '../base/allocator/allocator.gyp:allocator', 2263 '../base/allocator/allocator.gyp:allocator',
2262 ], 2264 ],
2263 }], 2265 }],
2264 ], 2266 ],
2265 }], 2267 }],
2266 ], # conditions 2268 ], # conditions
2267 }, # target performance_browser_tests 2269 }, # target performance_browser_tests
2268 { 2270 {
2269 'target_name': 'performance_ui_tests', 2271 'target_name': 'performance_ui_tests',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
2338 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2340 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2339 ], 2341 ],
2340 }], 2342 }],
2341 ['toolkit_uses_gtk == 1', { 2343 ['toolkit_uses_gtk == 1', {
2342 'dependencies': [ 2344 'dependencies': [
2343 '../build/linux/system.gyp:gtk', 2345 '../build/linux/system.gyp:gtk',
2344 ], 2346 ],
2345 }], 2347 }],
2346 ['os_posix == 1 and OS != "mac" and OS != "android"', { 2348 ['os_posix == 1 and OS != "mac" and OS != "android"', {
2347 'conditions': [ 2349 'conditions': [
2348 ['linux_use_tcmalloc==1', { 2350 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
2351 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
2349 'dependencies': [ 2352 'dependencies': [
2350 '../base/allocator/allocator.gyp:allocator', 2353 '../base/allocator/allocator.gyp:allocator',
2351 ], 2354 ],
2352 }], 2355 }],
2353 ], 2356 ],
2354 }], 2357 }],
2355 ['toolkit_views==1', { 2358 ['toolkit_views==1', {
2356 'dependencies': [ 2359 'dependencies': [
2357 '../ui/views/views.gyp:views', 2360 '../ui/views/views.gyp:views',
2358 ], 2361 ],
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
2943 }], 2946 }],
2944 ], 2947 ],
2945 }], 2948 }],
2946 ['toolkit_views==1', { 2949 ['toolkit_views==1', {
2947 'dependencies': [ 2950 'dependencies': [
2948 '../ui/views/views.gyp:views', 2951 '../ui/views/views.gyp:views',
2949 ], 2952 ],
2950 }], 2953 }],
2951 ['os_posix == 1 and OS != "mac" and OS != "android"', { 2954 ['os_posix == 1 and OS != "mac" and OS != "android"', {
2952 'conditions': [ 2955 'conditions': [
2953 ['linux_use_tcmalloc==1', { 2956 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345 554
2957 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
2954 'dependencies': [ 2958 'dependencies': [
2955 '../base/allocator/allocator.gyp:allocator', 2959 '../base/allocator/allocator.gyp:allocator',
2956 ], 2960 ],
2957 }], 2961 }],
2958 ], 2962 ],
2959 }], 2963 }],
2960 ['OS=="linux" and enable_webrtc==1', { 2964 ['OS=="linux" and enable_webrtc==1', {
2961 'dependencies': [ 2965 'dependencies': [
2962 '../third_party/libjingle/libjingle.gyp:libpeerconnection', 2966 '../third_party/libjingle/libjingle.gyp:libpeerconnection',
2963 ], 2967 ],
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
3232 'utility', 3236 'utility',
3233 ], 3237 ],
3234 'sources': [ 3238 'sources': [
3235 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3239 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3236 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3240 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3237 ], 3241 ],
3238 }] 3242 }]
3239 }], 3243 }],
3240 ], # 'conditions' 3244 ], # 'conditions'
3241 } 3245 }
OLDNEW
« ash/ash.gyp ('K') | « 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