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

Unified Diff: trunk/src/media/media.gyp

Issue 131063006: Revert 244098 "Fix chromeos=1 so Pulse is preferred when use_cra..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/media/media.gyp
===================================================================
--- trunk/src/media/media.gyp (revision 244099)
+++ trunk/src/media/media.gyp (working copy)
@@ -21,12 +21,15 @@
'media_use_ffmpeg%': 1,
'media_use_libvpx%': 1,
}],
- # Enable ALSA and Pulse for runtime selection.
- ['(OS=="linux" or OS=="freebsd" or OS=="solaris") and embedded!=1 and use_cras==0', {
+ # ALSA usage.
+ ['(OS=="linux" or OS=="freebsd" or OS=="solaris") and embedded!=1', {
'use_alsa%': 1,
+ }, {
+ 'use_alsa%': 0,
+ }],
+ ['os_posix==1 and OS!="mac" and OS!="android" and chromeos!=1 and embedded!=1', {
'use_pulseaudio%': 1,
}, {
- 'use_alsa%': 0,
'use_pulseaudio%': 0,
}],
],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698