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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 564e463ad288bd15c48e2dfbd53f7807a456dd60..defdcfd8edc9a72f9e3e9e2b967544deb240dbc2 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -21,15 +21,12 @@
'media_use_ffmpeg%': 1,
'media_use_libvpx%': 1,
}],
- # ALSA usage.
- ['(OS=="linux" or OS=="freebsd" or OS=="solaris") and embedded!=1', {
+ # Enable ALSA and Pulse for runtime selection.
+ ['(OS=="linux" or OS=="freebsd" or OS=="solaris") and embedded!=1 and use_cras==0', {
'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,
}],
],
« 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