Revert 152406 - Introduce shared_memory_support media target for PPAPI.

media/media.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   '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,
   },
   'targets': [
     {
-      # Minimal target for NaCl and other renderer side media clients which only
-      # need to send audio data across the shared memory to the browser process.
-      'target_name': 'shared_memory_support',
-      'type': '<(component)',
-      'dependencies': [
-        '../base/base.gyp:base',
-      ],
-      'defines': [
-        'MEDIA_IMPLEMENTATION',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'includes': [
-        'shared_memory_support.gypi',
-      ],
-      'sources': [
-        '<@(shared_memory_support_sources)',
-      ],
-    },
-    {
       'target_name': 'media',
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../crypto/crypto.gyp:crypto',
-        'shared_memory_support',
         '../ui/ui.gyp:ui',
         'yuv_convert',
       ],
       'defines': [
         'MEDIA_IMPLEMENTATION',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
@@ skipping 34 matching lines @@
         'audio/audio_output_dispatcher.cc',
         'audio/audio_output_dispatcher.h',
         'audio/audio_output_dispatcher_impl.cc',
         'audio/audio_output_dispatcher_impl.h',
         'audio/audio_output_ipc.cc',
         'audio/audio_output_ipc.h',
         'audio/audio_output_mixer.cc',
         'audio/audio_output_mixer.h',
         'audio/audio_output_proxy.cc',
         'audio/audio_output_proxy.h',
+        'audio/audio_parameters.cc',
+        'audio/audio_parameters.h',
         'audio/audio_util.cc',
         'audio/audio_util.h',
         'audio/cross_process_notification.cc',
         'audio/cross_process_notification.h',
         'audio/cross_process_notification_posix.cc',
         'audio/cross_process_notification_win.cc',
         'audio/fake_audio_input_stream.cc',
         'audio/fake_audio_input_stream.h',
         'audio/fake_audio_output_stream.cc',
         'audio/fake_audio_output_stream.h',
@@ skipping 42 matching lines @@
         'audio/win/avrt_wrapper_win.cc',
         'audio/win/avrt_wrapper_win.h',
         'audio/win/device_enumeration_win.cc',
         'audio/win/device_enumeration_win.h',
         'audio/win/wavein_input_win.cc',
         'audio/win/wavein_input_win.h',
         'audio/win/waveout_output_win.cc',
         'audio/win/waveout_output_win.h',
         'base/android/media_jni_registrar.cc',
         'base/android/media_jni_registrar.h',
+        'base/audio_bus.cc',
+        'base/audio_bus.h',
         'base/audio_decoder.cc',
         'base/audio_decoder.h',
         'base/audio_decoder_config.cc',
         'base/audio_decoder_config.h',
         'base/audio_renderer.cc',
         'base/audio_renderer.h',
         'base/audio_renderer_mixer.cc',
         'base/audio_renderer_mixer.h',
         'base/audio_renderer_mixer_input.cc',
         'base/audio_renderer_mixer_input.h',
         'base/bind_to_loop.h',
         'base/bitstream_buffer.h',
         'base/bit_reader.cc',
         'base/bit_reader.h',
         'base/buffers.cc',
         'base/buffers.h',
         'base/byte_queue.cc',
         'base/byte_queue.h',
+        'base/channel_layout.cc',
+        'base/channel_layout.h',
         'base/clock.cc',
         'base/clock.h',
         'base/data_buffer.cc',
         'base/data_buffer.h',
         'base/data_source.cc',
         'base/data_source.h',
         'base/decoder_buffer.cc',
         'base/decoder_buffer.h',
         'base/decryptor.h',
         'base/decryptor_client.h',
         'base/decrypt_config.cc',
         'base/decrypt_config.h',
         'base/demuxer.cc',
         'base/demuxer.h',
         'base/demuxer_stream.cc',
         'base/demuxer_stream.h',
         'base/djb2.cc',
         'base/djb2.h',
         'base/filter_collection.cc',
         'base/filter_collection.h',
         'base/media.h',
         'base/media_android.cc',
+        'base/media_export.h',
         'base/media_log.cc',
         'base/media_log.h',
         'base/media_log_event.h',
         'base/media_posix.cc',
         'base/media_switches.cc',
         'base/media_switches.h',
         'base/media_win.cc',
         'base/message_loop_factory.cc',
         'base/message_loop_factory.h',
         'base/multi_channel_resampler.cc',
@@ skipping 469 matching lines @@
         'base/simd/yuv_to_rgb_table.cc',
         'base/simd/yuv_to_rgb_table.h',
       ],
     },
     {
       'target_name': 'media_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         'media',
         'media_test_support',
-        'shared_memory_support',
         'yuv_convert',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/ui.gyp:ui',
       ],
       'sources': [
         'audio/async_socket_io_handler_unittest.cc',
@@ skipping 481 matching lines @@
             'media',
           ],
           'sources': [
             'tools/media_bench/media_bench.cc',
           ],
         },
       ],
     }]
   ],
 }