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

Unified Diff: media/media.gyp

Issue 12963004: Linux: provide a gyp option not to use pulseaudio. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index a3fcb3de649f575d98a6f040c7b626acae2db3b2..82bab1c4bc4abc5ec751778497e27ad4b9da2dff 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -29,6 +29,11 @@
}, {
'use_alsa%': 0,
}],
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and chromeos != 1', {
+ 'use_pulseaudio%': 1,
+ }, {
+ 'use_pulseaudio%': 0,
+ }],
],
},
'targets': [
@@ -648,7 +653,7 @@
'audio/cras/cras_output.h',
],
}],
- ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and chromeos != 1', {
+ ['use_pulseaudio==1', {
'defines': [
'USE_PULSEAUDIO',
],
@@ -704,7 +709,7 @@
},
}],
],
- }, { # else: OS=="win or OS == "mac" or OS == "ios" or OS == "android" or chromeos == 1
+ }, { # else: use_pulseaudio==1
'sources!': [
'audio/pulse/audio_manager_pulse.cc',
'audio/pulse/audio_manager_pulse.h',
« 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