summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authormostynb@opera.com <mostynb@opera.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-27 19:58:12 +0000
committermostynb@opera.com <mostynb@opera.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-27 19:58:12 +0000
commitae08490d829137f260fbfe091c67f180eefe43a9 (patch)
tree7922ac7bb6dd7a1c826ec44798229cbbb056b90b /media
parenta500c88fed4686df6bd9f72d6e6fc592c538c873 (diff)
downloadchromium_src-ae08490d829137f260fbfe091c67f180eefe43a9.zip
chromium_src-ae08490d829137f260fbfe091c67f180eefe43a9.tar.gz
chromium_src-ae08490d829137f260fbfe091c67f180eefe43a9.tar.bz2
add a use_alsa gyp setting
By adding a gyp setting, we can explicitly disable alsa on various unix targets that don't include alsa. BUG= TEST=Build with use_alsa=0 then run ldd on output binaries to verify libasound is not listed (and is listed if built with use_alsa=1 or unspecified). Review URL: https://chromiumcodereview.appspot.com/12316049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185011 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/media.gyp23
1 files changed, 15 insertions, 8 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 84c63d7..269aa2b 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -25,6 +25,12 @@
}, {
'screen_capture_supported%': 0,
}],
+ # ALSA usage.
+ ['OS=="linux" or OS=="freebsd" or OS=="solaris"', {
+ 'use_alsa%': 1,
+ }, {
+ 'use_alsa%': 0,
+ }],
],
},
'targets': [
@@ -561,20 +567,15 @@
'webm/chromeos/webm_encoder.h',
],
}],
- ['OS=="linux" or OS=="freebsd" or OS=="solaris"', {
+ ['use_alsa==1', {
'link_settings': {
'libraries': [
'-lasound',
],
},
- }],
- ['OS=="openbsd"', {
+ }, { # use_alsa==0
'sources/': [ ['exclude', '/alsa_' ],
- ['exclude', '/audio_manager_linux' ] ],
- 'link_settings': {
- 'libraries': [
- ],
- },
+ ['exclude', '/audio_manager_linux' ] ],
}],
['OS!="openbsd"', {
'sources!': [
@@ -1013,6 +1014,12 @@
}],
],
}],
+ ['use_alsa==0', {
+ 'sources!': [
+ 'audio/linux/alsa_output_unittest.cc',
+ 'audio/audio_low_latency_input_output_unittest.cc',
+ ],
+ }],
[ 'target_arch=="ia32" or target_arch=="x64"', {
'sources': [
'base/simd/convert_rgb_to_yuv_unittest.cc',