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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 258433005: Remove {linux|android}_use_tcmalloc and switch to use_allocator in Chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 7 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 'includes': [ 5 'includes': [
6 'js_unittest_vars.gypi', 6 'js_unittest_vars.gypi',
7 ], 7 ],
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'interactive_ui_tests', 10 'target_name': 'interactive_ui_tests',
(...skipping 1847 matching lines...) Expand 10 before | Expand all | Expand 10 after
1858 ], 1858 ],
1859 }], 1859 }],
1860 ['OS=="android"', { 1860 ['OS=="android"', {
1861 'sources!': [ 1861 'sources!': [
1862 'browser/policy/cloud/component_cloud_policy_browsertest.cc', 1862 'browser/policy/cloud/component_cloud_policy_browsertest.cc',
1863 'browser/prefs/pref_hash_browsertest.cc', 1863 'browser/prefs/pref_hash_browsertest.cc',
1864 ], 1864 ],
1865 }], 1865 }],
1866 ['os_posix == 1 and OS != "mac" and OS != "android"', { 1866 ['os_posix == 1 and OS != "mac" and OS != "android"', {
1867 'conditions': [ 1867 'conditions': [
1868 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 1868 ['use_allocator!="none"', {
1869 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
1870 'dependencies': [ 1869 'dependencies': [
1871 '../base/allocator/allocator.gyp:allocator', 1870 '../base/allocator/allocator.gyp:allocator',
1872 ], 1871 ],
1873 }], 1872 }],
1874 ], 1873 ],
1875 }], 1874 }],
1876 ['chromeos == 1 or OS=="win" or OS == "mac"', { 1875 ['chromeos == 1 or OS=="win" or OS == "mac"', {
1877 'sources': [ 1876 'sources': [
1878 'browser/extensions/api/networking_private/networking_private_apites t.cc', 1877 'browser/extensions/api/networking_private/networking_private_apites t.cc',
1879 ], 1878 ],
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
2126 'chrome', 2125 'chrome',
2127 '../components/components.gyp:breakpad_stubs', 2126 '../components/components.gyp:breakpad_stubs',
2128 ], 2127 ],
2129 }, { # OS!="mac" 2128 }, { # OS!="mac"
2130 'sources!': [ 2129 'sources!': [
2131 'test/perf/mach_ports_performancetest.cc', 2130 'test/perf/mach_ports_performancetest.cc',
2132 ], 2131 ],
2133 }], 2132 }],
2134 ['os_posix == 1 and OS != "mac" and OS != "android"', { 2133 ['os_posix == 1 and OS != "mac" and OS != "android"', {
2135 'conditions': [ 2134 'conditions': [
2136 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 2135 ['use_allocator!="none"', {
2137 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
2138 'dependencies': [ 2136 'dependencies': [
2139 '../base/allocator/allocator.gyp:allocator', 2137 '../base/allocator/allocator.gyp:allocator',
2140 ], 2138 ],
2141 }], 2139 }],
2142 ], 2140 ],
2143 }], 2141 }],
2144 ], # conditions 2142 ], # conditions
2145 }, # target performance_browser_tests 2143 }, # target performance_browser_tests
2146 { 2144 {
2147 'target_name': 'test_support_sync_integration', 2145 'target_name': 'test_support_sync_integration',
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
2635 }], 2633 }],
2636 ], 2634 ],
2637 }], 2635 }],
2638 ['toolkit_views==1', { 2636 ['toolkit_views==1', {
2639 'dependencies': [ 2637 'dependencies': [
2640 '../ui/views/views.gyp:views', 2638 '../ui/views/views.gyp:views',
2641 ], 2639 ],
2642 }], 2640 }],
2643 ['os_posix == 1 and OS != "mac" and OS != "android"', { 2641 ['os_posix == 1 and OS != "mac" and OS != "android"', {
2644 'conditions': [ 2642 'conditions': [
2645 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345 554 2643 ['use_allocator!="none"', {
2646 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
2647 'dependencies': [ 2644 'dependencies': [
2648 '../base/allocator/allocator.gyp:allocator', 2645 '../base/allocator/allocator.gyp:allocator',
2649 ], 2646 ],
2650 }], 2647 }],
2651 ], 2648 ],
2652 }], 2649 }],
2653 ['OS=="linux" and enable_webrtc==1', { 2650 ['OS=="linux" and enable_webrtc==1', {
2654 'dependencies': [ 2651 'dependencies': [
2655 '../third_party/libjingle/libjingle.gyp:libpeerconnection', 2652 '../third_party/libjingle/libjingle.gyp:libpeerconnection',
2656 ], 2653 ],
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
2932 ['enable_webrtc==1', { 2929 ['enable_webrtc==1', {
2933 'dependencies': [ 2930 'dependencies': [
2934 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 2931 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
2935 ] 2932 ]
2936 }], 2933 }],
2937 ], 2934 ],
2938 }] 2935 }]
2939 }], 2936 }],
2940 ], # 'conditions' 2937 ], # 'conditions'
2941 } 2938 }
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