Revert 187677 "This patch enables pulse as the default IO handli..."

This broke the ChromeOS bots. See:
http://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20%28daisy%29/builds/7853/steps/cbuildbot/logs/stdio
chromeos-chrome-27.0.1439.0_alpha-r1: In file included from media/audio/pulse/audio_manager_pulse.cc:5:0:
chromeos-chrome-27.0.1439.0_alpha-r1: ./media/audio/pulse/audio_manager_pulse.h:8:30: fatal error: pulse/pulseaudio.h: No such file or directory


> This patch enables pulse as the default IO handling in Chrome.
> 
> Right now we have the dynamic linking for pulse library, for the machine without pulse, it will automatically fall back to ALSA.
> 
> In order to enable pulse as the default IO, libpulse-dev package is required to build Chrome on linux. Previously libpulse-dev is only required if building chromeOS, right now it is also required by building chrome.
> 
> 
> Note, we still have some small issues for the pulse implementations, so this patch needs to be landed after https://codereview.chromium.org/12328097/,
> https://codereview.chromium.org/12316131/, https://codereview.chromium.org/12310102/ and
> https://codereview.chromium.org/12613005/
> 
> 
> BUG=178101
> TEST=compile on linux
> 
> Review URL: https://chromiumcodereview.appspot.com/12310101

TBR=xians@chromium.org
Review URL: https://codereview.chromium.org/12567014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187701 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 78 insertions, 60 deletions

diff --git a/media/media.gyp b/media/media.gyp
index b1e3d88..5fc573a 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -5,6 +5,8 @@
 {
   'variables': {
     'chromium_code': 1,
+    # Override to dynamically link the PulseAudio library.
+    'use_pulseaudio%': 0,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     'conditions': [
@@ -638,72 +640,80 @@
             'audio/cras/cras_output.h',
           ],
         }],
-        ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
-          'variables': {
-            'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
-            'extra_header': 'audio/pulse/pulse_stub_header.fragment',
-            'sig_files': ['audio/pulse/pulse.sigs'],
-            'outfile_type': 'posix_stubs',
-            'stubs_filename_root': 'pulse_stubs',
-            'project_path': 'media/audio/pulse',
-            'intermediate_dir': '<(INTERMEDIATE_DIR)',
-            'output_root': '<(SHARED_INTERMEDIATE_DIR)/pulse',
-          },
-          'sources': [
-            '<(extra_header)',
-          ],
-          'include_dirs': [
-            '<(output_root)',
-          ],
-          'actions': [
-            {
-              'action_name': 'generate_stubs',
-              'inputs': [
-                '<(generate_stubs_script)',
+        ['os_posix == 1', {
+          'conditions': [
+            ['use_pulseaudio == 1', {
+              'cflags': [
+                '<!@(pkg-config --cflags libpulse)',
+              ],
+              'defines': [
+                'USE_PULSEAUDIO',
+              ],
+              'variables': {
+                'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
+                'extra_header': 'audio/pulse/pulse_stub_header.fragment',
+                'sig_files': ['audio/pulse/pulse.sigs'],
+                'outfile_type': 'posix_stubs',
+                'stubs_filename_root': 'pulse_stubs',
+                'project_path': 'media/audio/pulse',
+                'intermediate_dir': '<(INTERMEDIATE_DIR)',
+                'output_root': '<(SHARED_INTERMEDIATE_DIR)/pulse',
+              },
+              'sources': [
                 '<(extra_header)',
-                '<@(sig_files)',
               ],
-              'outputs': [
-                '<(intermediate_dir)/<(stubs_filename_root).cc',
-                '<(output_root)/<(project_path)/<(stubs_filename_root).h',
+              'include_dirs': [
+                '<(output_root)',
+               ],
+              'actions': [
+                {
+                  'action_name': 'generate_stubs',
+                  'inputs': [
+                    '<(generate_stubs_script)',
+                    '<(extra_header)',
+                    '<@(sig_files)',
+                  ],
+                  'outputs': [
+                    '<(intermediate_dir)/<(stubs_filename_root).cc',
+                    '<(output_root)/<(project_path)/<(stubs_filename_root).h',
+                  ],
+                  'action': ['python',
+                             '<(generate_stubs_script)',
+                             '-i', '<(intermediate_dir)',
+                             '-o', '<(output_root)/<(project_path)',
+                             '-t', '<(outfile_type)',
+                             '-e', '<(extra_header)',
+                             '-s', '<(stubs_filename_root)',
+                             '-p', '<(project_path)',
+                             '<@(_inputs)',
+                  ],
+                  'process_outputs_as_sources': 1,
+                  'message': 'Generating Pulse stubs for dynamic loading.',
+                },
               ],
-              'action': ['python',
-                         '<(generate_stubs_script)',
-                         '-i', '<(intermediate_dir)',
-                         '-o', '<(output_root)/<(project_path)',
-                         '-t', '<(outfile_type)',
-                         '-e', '<(extra_header)',
-                         '-s', '<(stubs_filename_root)',
-                         '-p', '<(project_path)',
-                         '<@(_inputs)',
+              'conditions': [
+                # Linux/Solaris need libdl for dlopen() and friends.
+                ['OS == "linux" or OS == "solaris"', {
+                  'link_settings': {
+                    'libraries': [
+                      '-ldl',
+                    ],
+                  },
+                }],
+              ],
+            }, {  # else: use_pulseaudio == 0
+              'sources!': [
+                'audio/pulse/audio_manager_pulse.cc',
+                'audio/pulse/audio_manager_pulse.h',
+                'audio/pulse/pulse_input.cc',
+                'audio/pulse/pulse_input.h',
+                'audio/pulse/pulse_output.cc',
+                'audio/pulse/pulse_output.h',
+                'audio/pulse/pulse_util.cc',
+                'audio/pulse/pulse_util.h',
               ],
-              'process_outputs_as_sources': 1,
-              'message': 'Generating Pulse stubs for dynamic loading.',
-            },
-          ],
-          'conditions': [ 
-            # Linux/Solaris need libdl for dlopen() and friends.
-            ['OS == "linux" or OS == "solaris"', {
-              'link_settings': {
-                'libraries': [
-                  '-ldl',
-                ],
-              },
             }],
           ],
-        }, {  # else: OS=="win or OS == "mac" or OS == "ios" or OS == "android"
-          'sources!': [
-            'audio/pulse/audio_manager_pulse.cc',
-            'audio/pulse/audio_manager_pulse.h',
-            'audio/pulse/pulse_input.cc',
-            'audio/pulse/pulse_input.h',
-            'audio/pulse/pulse_output.cc',
-            'audio/pulse/pulse_output.h',
-            'audio/pulse/pulse_util.cc',
-            'audio/pulse/pulse_util.h',
-          ],
-        }],
-        ['os_posix == 1', {
           'sources!': [
             'video/capture/video_capture_device_dummy.cc',
             'video/capture/video_capture_device_dummy.h',
@@ -723,6 +733,14 @@
         }],
         ['OS=="win"', {
           'sources!': [
+            'audio/pulse/audio_manager_pulse.cc',
+            'audio/pulse/audio_manager_pulse.h',
+            'audio/pulse/pulse_input.cc',
+            'audio/pulse/pulse_input.h',
+            'audio/pulse/pulse_output.cc',
+            'audio/pulse/pulse_output.h',
+            'audio/pulse/pulse_util.cc',
+            'audio/pulse/pulse_util.h',
             'video/capture/video_capture_device_dummy.cc',
             'video/capture/video_capture_device_dummy.h',
           ],