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

Side by Side Diff: content/content_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 | « content/content_shell.gypi ('k') | courgette/courgette.gyp » ('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) 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': 'layouttest_support_content', 8 'target_name': 'layouttest_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'conditions': [ 10 'conditions': [
(...skipping 1392 matching lines...) Expand 10 before | Expand all | Expand 10 after
1403 'sources/': [ 1403 'sources/': [
1404 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'], 1404 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'],
1405 ], 1405 ],
1406 }], 1406 }],
1407 ['OS=="win"', { 1407 ['OS=="win"', {
1408 'dependencies': [ 1408 'dependencies': [
1409 '<(angle_path)/src/build_angle.gyp:libEGL', 1409 '<(angle_path)/src/build_angle.gyp:libEGL',
1410 '<(angle_path)/src/build_angle.gyp:libGLESv2', 1410 '<(angle_path)/src/build_angle.gyp:libGLESv2',
1411 ], 1411 ],
1412 }], 1412 }],
1413 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/34555 4
1414 ['(OS=="win" and win_use_allocator_shim==1) or ' 1413 ['(OS=="win" and win_use_allocator_shim==1) or '
1415 '(os_posix == 1 and OS != "android" and ' 1414 '(os_posix == 1 and OS != "android" and '
1416 ' ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)))', { 1415 ' use_allocator!="none")', {
1417 'dependencies': [ 1416 'dependencies': [
1418 '../base/allocator/allocator.gyp:allocator', 1417 '../base/allocator/allocator.gyp:allocator',
1419 ], 1418 ],
1420 }], 1419 }],
1421 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', { 1420 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {
1422 'include_dirs': [ 1421 'include_dirs': [
1423 '<(DEPTH)/third_party/libva', 1422 '<(DEPTH)/third_party/libva',
1424 ], 1423 ],
1425 }], 1424 }],
1426 ['use_x11==1', { 1425 ['use_x11==1', {
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
1818 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1817 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1819 }, 1818 },
1820 ], 1819 ],
1821 }], 1820 }],
1822 ], 1821 ],
1823 }, 1822 },
1824 ], 1823 ],
1825 }], 1824 }],
1826 ], 1825 ],
1827 } 1826 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | courgette/courgette.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698