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

Side by Side Diff: content/content_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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'dependencies': [ 10 'dependencies': [
(...skipping 1294 matching lines...) Expand 10 before | Expand all | Expand 10 after
1305 'sources/': [ 1305 'sources/': [
1306 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'], 1306 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'],
1307 ], 1307 ],
1308 }], 1308 }],
1309 ['OS=="win"', { 1309 ['OS=="win"', {
1310 'dependencies': [ 1310 'dependencies': [
1311 '<(angle_path)/src/build_angle.gyp:libEGL', 1311 '<(angle_path)/src/build_angle.gyp:libEGL',
1312 '<(angle_path)/src/build_angle.gyp:libGLESv2', 1312 '<(angle_path)/src/build_angle.gyp:libGLESv2',
1313 ], 1313 ],
1314 }], 1314 }],
1315 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/34555 4
1315 ['(OS=="win" and win_use_allocator_shim==1) or ' 1316 ['(OS=="win" and win_use_allocator_shim==1) or '
1316 '(os_posix == 1 and OS != "android" and ' 1317 '(os_posix == 1 and OS != "android" and '
1317 ' linux_use_tcmalloc==1)', { 1318 ' ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)))', {
1318 'dependencies': [ 1319 'dependencies': [
1319 '../base/allocator/allocator.gyp:allocator', 1320 '../base/allocator/allocator.gyp:allocator',
1320 ], 1321 ],
1321 }], 1322 }],
1322 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', { 1323 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {
1323 'include_dirs': [ 1324 'include_dirs': [
1324 '<(DEPTH)/third_party/libva', 1325 '<(DEPTH)/third_party/libva',
1325 ], 1326 ],
1326 }], 1327 }],
1327 ['use_x11==1', { 1328 ['use_x11==1', {
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
1704 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1705 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1705 }, 1706 },
1706 ], 1707 ],
1707 }], 1708 }],
1708 ], 1709 ],
1709 }, 1710 },
1710 ], 1711 ],
1711 }], 1712 }],
1712 ], 1713 ],
1713 } 1714 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | courgette/courgette.gyp » ('j') | ui/keyboard/keyboard.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698