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

Side by Side Diff: media/media.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 | « ipc/ipc.gyp ('k') | net/net.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) 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 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 1086 matching lines...) Expand 10 before | Expand all | Expand 10 after
1097 'USE_ALSA', 1097 'USE_ALSA',
1098 ], 1098 ],
1099 }], 1099 }],
1100 ['use_pulseaudio==1', { 1100 ['use_pulseaudio==1', {
1101 'defines': [ 1101 'defines': [
1102 'USE_PULSEAUDIO', 1102 'USE_PULSEAUDIO',
1103 ], 1103 ],
1104 }], 1104 }],
1105 ['os_posix==1 and OS!="mac"', { 1105 ['os_posix==1 and OS!="mac"', {
1106 'conditions': [ 1106 'conditions': [
1107 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 1107 ['use_allocator!="none"', {
1108 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
1109 'dependencies': [ 1108 'dependencies': [
1110 '../base/allocator/allocator.gyp:allocator', 1109 '../base/allocator/allocator.gyp:allocator',
1111 ], 1110 ],
1112 }], 1111 }],
1113 ], 1112 ],
1114 }], 1113 }],
1115 ['OS=="android"', { 1114 ['OS=="android"', {
1116 'sources!': [ 1115 'sources!': [
1117 'audio/audio_input_volume_unittest.cc', 1116 'audio/audio_input_volume_unittest.cc',
1118 'base/container_names_unittest.cc', 1117 'base/container_names_unittest.cc',
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
1684 'media_test_support', 1683 'media_test_support',
1685 ], 1684 ],
1686 'sources': [ 1685 'sources': [
1687 'base/run_all_unittests.cc', 1686 'base/run_all_unittests.cc',
1688 'ffmpeg/ffmpeg_regression_tests.cc', 1687 'ffmpeg/ffmpeg_regression_tests.cc',
1689 'filters/pipeline_integration_test_base.cc', 1688 'filters/pipeline_integration_test_base.cc',
1690 ], 1689 ],
1691 'conditions': [ 1690 'conditions': [
1692 ['os_posix==1 and OS!="mac"', { 1691 ['os_posix==1 and OS!="mac"', {
1693 'conditions': [ 1692 'conditions': [
1694 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345 554 1693 ['use_allocator!="none"', {
1695 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
1696 'dependencies': [ 1694 'dependencies': [
1697 '../base/allocator/allocator.gyp:allocator', 1695 '../base/allocator/allocator.gyp:allocator',
1698 ], 1696 ],
1699 }], 1697 }],
1700 ], 1698 ],
1701 }], 1699 }],
1702 ], 1700 ],
1703 }, 1701 },
1704 ], 1702 ],
1705 }], 1703 }],
1706 ], 1704 ],
1707 } 1705 }
OLDNEW
« no previous file with comments | « ipc/ipc.gyp ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698