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

Side by Side Diff: sql/sql.gyp

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 | « remoting/remoting_test.gypi ('k') | sync/sync_tests.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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 'sqlite_features_unittest.cc', 92 'sqlite_features_unittest.cc',
93 'statement_unittest.cc', 93 'statement_unittest.cc',
94 'transaction_unittest.cc', 94 'transaction_unittest.cc',
95 ], 95 ],
96 'include_dirs': [ 96 'include_dirs': [
97 '..', 97 '..',
98 ], 98 ],
99 'conditions': [ 99 'conditions': [
100 ['os_posix==1 and OS!="mac" and OS!="ios"', { 100 ['os_posix==1 and OS!="mac" and OS!="ios"', {
101 'conditions': [ 101 'conditions': [
102 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 102 ['use_allocator!="none"', {
103 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
104 'dependencies': [ 103 'dependencies': [
105 '../base/allocator/allocator.gyp:allocator', 104 '../base/allocator/allocator.gyp:allocator',
106 ], 105 ],
107 }], 106 }],
108 ], 107 ],
109 }], 108 }],
110 ['OS == "android" and gtest_target_type == "shared_library"', { 109 ['OS == "android" and gtest_target_type == "shared_library"', {
111 'dependencies': [ 110 'dependencies': [
112 '../testing/android/native_test.gyp:native_test_native_code', 111 '../testing/android/native_test.gyp:native_test_native_code',
113 ], 112 ],
(...skipping 16 matching lines...) Expand all
130 ], 129 ],
131 'variables': { 130 'variables': {
132 'test_suite_name': 'sql_unittests', 131 'test_suite_name': 'sql_unittests',
133 }, 132 },
134 'includes': [ '../build/apk_test.gypi' ], 133 'includes': [ '../build/apk_test.gypi' ],
135 }, 134 },
136 ], 135 ],
137 }], 136 }],
138 ], 137 ],
139 } 138 }
OLDNEW
« no previous file with comments | « remoting/remoting_test.gypi ('k') | sync/sync_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698