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

Side by Side Diff: cc/cc_tests.gyp

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 | « build/gyp_chromium ('k') | chrome/chrome_exe.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 'cc_unit_tests_source_files': [ 8 'cc_unit_tests_source_files': [
9 'animation/animation_unittest.cc', 9 'animation/animation_unittest.cc',
10 'animation/keyframed_animation_curve_unittest.cc', 10 'animation/keyframed_animation_curve_unittest.cc',
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 ['OS == "android" and gtest_target_type == "shared_library"', 250 ['OS == "android" and gtest_target_type == "shared_library"',
251 { 251 {
252 'dependencies': [ 252 'dependencies': [
253 '../testing/android/native_test.gyp:native_test_native_code', 253 '../testing/android/native_test.gyp:native_test_native_code',
254 ], 254 ],
255 } 255 }
256 ], 256 ],
257 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', 257 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"',
258 { 258 {
259 'conditions': [ 259 'conditions': [
260 [ 'linux_use_tcmalloc==1', 260 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/34555 4
261 [ '(use_allocator!="none" and use_allocator!="see_use_tcmalloc") o r (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)',
261 { 262 {
262 'dependencies': [ 263 'dependencies': [
263 '../base/allocator/allocator.gyp:allocator', 264 '../base/allocator/allocator.gyp:allocator',
264 ], 265 ],
265 } 266 }
266 ], 267 ],
267 ], 268 ],
268 } 269 }
269 ], 270 ],
270 ], 271 ],
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 ], 308 ],
308 'conditions': [ 309 'conditions': [
309 ['OS == "android" and gtest_target_type == "shared_library"', 310 ['OS == "android" and gtest_target_type == "shared_library"',
310 { 311 {
311 'dependencies': [ 312 'dependencies': [
312 '../testing/android/native_test.gyp:native_test_native_code', 313 '../testing/android/native_test.gyp:native_test_native_code',
313 ], 314 ],
314 } 315 }
315 ], 316 ],
316 # See http://crbug.com/162998#c4 for why this is needed. 317 # See http://crbug.com/162998#c4 for why this is needed.
317 ['OS=="linux" and linux_use_tcmalloc==1', 318 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
319 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))',
318 { 320 {
319 'dependencies': [ 321 'dependencies': [
320 '../base/allocator/allocator.gyp:allocator', 322 '../base/allocator/allocator.gyp:allocator',
321 ], 323 ],
322 } 324 }
323 ], 325 ],
324 ], 326 ],
325 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 327 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
326 'msvs_disabled_warnings': [ 4267, ], 328 'msvs_disabled_warnings': [ 4267, ],
327 }, 329 },
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 'test_suite_name': 'cc_perftests', 386 'test_suite_name': 'cc_perftests',
385 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)cc_perf tests<(SHARED_LIB_SUFFIX)', 387 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)cc_perf tests<(SHARED_LIB_SUFFIX)',
386 }, 388 },
387 'includes': [ '../build/apk_test.gypi' ], 389 'includes': [ '../build/apk_test.gypi' ],
388 }, 390 },
389 ], 391 ],
390 } 392 }
391 ] 393 ]
392 ], 394 ],
393 } 395 }
OLDNEW
« no previous file with comments | « build/gyp_chromium ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698