From 647aa16f0d55065228a978e83485b2ea5251599a Mon Sep 17 00:00:00 2001
From: "wjia@google.com" <wjia@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Thu, 21 Jul 2011 20:45:31 +0000
Subject: [PATCH] exclude pulse audio when building with Chromium.

BUG=none
TEST=local
Review URL: http://webrtc-codereview.appspot.com/91001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@240 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 src/build/common.gypi                         |  7 ++++
 .../audio_device/main/source/audio_device.gyp | 34 +++++++++++--------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/build/common.gypi b/src/build/common.gypi
index bb19e37f10..53431750ae 100644
--- a/src/build/common.gypi
+++ b/src/build/common.gypi
@@ -25,6 +25,13 @@
         'direct_show_base_classes':
           'C:/Program Files/Microsoft SDKs/Windows/v7.1/Samples/multimedia/directshow/baseclasses/',
       }],
+      ['build_with_chromium==1', {
+        # Exclude pulse audio on Chromium since its prerequisites don't
+        # include pulse audio.
+        'include_pulse_audio%': 0,
+      }, {
+        'include_pulse_audio%': 1,
+      }],
     ], # conditions
   },
   'target_defaults': {
diff --git a/src/modules/audio_device/main/source/audio_device.gyp b/src/modules/audio_device/main/source/audio_device.gyp
index 1570b425b6..519dcfc73b 100644
--- a/src/modules/audio_device/main/source/audio_device.gyp
+++ b/src/modules/audio_device/main/source/audio_device.gyp
@@ -52,18 +52,12 @@
         'Linux/alsasymboltable.h',
         'Linux/audio_device_linux_alsa.cc',
         'Linux/audio_device_linux_alsa.h',
-        'Linux/audio_device_linux_pulse.cc',
-        'Linux/audio_device_linux_pulse.h',
         'Linux/audio_device_utility_linux.cc',
         'Linux/audio_device_utility_linux.h',
         'Linux/audio_mixer_manager_linux_alsa.cc',
         'Linux/audio_mixer_manager_linux_alsa.h',
-        'Linux/audio_mixer_manager_linux_pulse.cc',
-        'Linux/audio_mixer_manager_linux_pulse.h',
         'Linux/latebindingsymboltable.cc',
         'Linux/latebindingsymboltable.h',
-        'Linux/pulseaudiosymboltable.cc',
-        'Linux/pulseaudiosymboltable.h',
         'Mac/audio_device_mac.cc',
         'Mac/audio_device_mac.h',
         'Mac/audio_device_utility_mac.cc',
@@ -89,16 +83,10 @@
             'Linux/alsasymboltable.h',
             'Linux/audio_device_linux_alsa.cc',
             'Linux/audio_device_linux_alsa.h',
-            'Linux/audio_device_linux_pulse.cc',
-            'Linux/audio_device_linux_pulse.h',
             'Linux/audio_mixer_manager_linux_alsa.cc',
             'Linux/audio_mixer_manager_linux_alsa.h',
-            'Linux/audio_mixer_manager_linux_pulse.cc',
-            'Linux/audio_mixer_manager_linux_pulse.h',
             'Linux/latebindingsymboltable.cc',
             'Linux/latebindingsymboltable.h',
-            'Linux/pulseaudiosymboltable.cc',
-            'Linux/pulseaudiosymboltable.h',
             # Don't remove these, needed for dummy device
             # 'Linux/audio_device_utility_linux.cc',
             # 'Linux/audio_device_utility_linux.h',
@@ -131,7 +119,6 @@
         }],
         ['OS=="linux"', {
           'defines': [
-            'LINUX_PULSE',
             'LINUX_ALSA',
           ],
           'include_dirs': [
@@ -141,9 +128,28 @@
             'libraries': [
               '-ldl',
               '-lasound',
-              '-lpulse',
             ],
           },
+          'conditions': [
+            ['include_pulse_audio==1', {
+              'defines': [
+                'LINUX_PULSE',
+              ],
+              'sources': [
+                'Linux/audio_device_linux_pulse.cc',
+                'Linux/audio_device_linux_pulse.h',
+                'Linux/audio_mixer_manager_linux_pulse.cc',
+                'Linux/audio_mixer_manager_linux_pulse.h',
+                'Linux/pulseaudiosymboltable.cc',
+                'Linux/pulseaudiosymboltable.h',
+              ],
+              'link_settings': {
+                'libraries': [
+                  '-lpulse',
+                ],
+              },
+            }],
+          ],
         }],
         ['OS=="mac"', {
           'include_dirs': [