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

Side by Side Diff: media/media.gyp

Issue 132773002: Fix chromeos=1 so Pulse is preferred when use_cras=0. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove alsa_util.h dependency. Created 6 years, 11 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) 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
11 # (DT_NEEDED) instead of using dlopen. This helps with automated 11 # (DT_NEEDED) instead of using dlopen. This helps with automated
12 # detection of ABI mismatches and prevents silent errors. 12 # detection of ABI mismatches and prevents silent errors.
13 'linux_link_pulseaudio%': 0, 13 'linux_link_pulseaudio%': 0,
14 'conditions': [ 14 'conditions': [
15 ['OS=="android"', { 15 ['OS=="android"', {
16 # Android doesn't use ffmpeg. 16 # Android doesn't use ffmpeg.
17 'media_use_ffmpeg%': 0, 17 'media_use_ffmpeg%': 0,
18 # Android doesn't use libvpx. 18 # Android doesn't use libvpx.
19 'media_use_libvpx%': 0, 19 'media_use_libvpx%': 0,
20 }, { # 'OS!="android"' 20 }, { # 'OS!="android"'
21 'media_use_ffmpeg%': 1, 21 'media_use_ffmpeg%': 1,
22 'media_use_libvpx%': 1, 22 'media_use_libvpx%': 1,
23 }], 23 }],
24 # ALSA usage. 24 # Enable ALSA and Pulse for runtime selection.
25 ['(OS=="linux" or OS=="freebsd" or OS=="solaris") and embedded!=1', { 25 ['(OS=="linux" or OS=="freebsd" or OS=="solaris") and embedded!=1 and use_ cras==0', {
26 'use_alsa%': 1, 26 'use_alsa%': 1,
27 'use_pulseaudio%': 1,
27 }, { 28 }, {
28 'use_alsa%': 0, 29 'use_alsa%': 0,
29 }],
30 ['os_posix==1 and OS!="mac" and OS!="android" and chromeos!=1 and embedded !=1', {
31 'use_pulseaudio%': 1,
32 }, {
33 'use_pulseaudio%': 0, 30 'use_pulseaudio%': 0,
34 }], 31 }],
35 ], 32 ],
36 }, 33 },
37 'includes': [ 34 'includes': [
38 'media_cdm.gypi', 35 'media_cdm.gypi',
39 ], 36 ],
40 'targets': [ 37 'targets': [
41 { 38 {
42 'target_name': 'media', 39 'target_name': 'media',
(...skipping 1606 matching lines...) Expand 10 before | Expand all | Expand 10 after
1649 ], 1646 ],
1650 }], 1647 }],
1651 ], 1648 ],
1652 }], 1649 }],
1653 ], 1650 ],
1654 }, 1651 },
1655 ], 1652 ],
1656 }], 1653 }],
1657 ], 1654 ],
1658 } 1655 }
OLDNEW
« media/audio/cras/cras_unified_unittest.cc ('K') | « media/audio/cras/cras_unified_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698