Build supported media targets on iOS.

media/media.gyp

Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index a830de99495b75f63e372030c192e0f09ba82e27..087f2b743b4c5c99e4458be4f00e5ca08d48f65b 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -16,12 +16,9 @@
       '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',
@@ -176,6 +173,7 @@
         'base/filter_collection.h',
         'base/media.h',
         'base/media_android.cc',
+        'base/media_ios.cc',
         'base/media_log.cc',
         'base/media_log.h',
         'base/media_log_event.h',
@@ -308,13 +306,60 @@
         ],
       },
       'conditions': [
-        # Android doesn't use ffmpeg, so make the dependency conditional
-        # and exclude the sources which depend on ffmpeg.
-        ['OS != "android"', {
+        ['OS != "ios"', {
+          'dependencies': [
+            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+            'shared_memory_support',
+            'yuv_convert',
+          ],
+        }],
+        ['OS == "ios"', {
+          'includes': [
+            # For shared_memory_support_sources variable.
+            'shared_memory_support.gypi',
+          ],
+          # These sources are normally built via a dependency on the
+          # shared_memory_support target, but that target is not built on iOS.
+          # Instead, directly build only the files that are needed for iOS.
+          'sources': [
+            '<@(shared_memory_support_sources)',
+          ],
+          'sources/': [
+            # IOS support is limited to audio input only.

[stuartmorgan, 2012/09/05 11:10:19]

iOS

[blundell, 2012/09/05 12:04:29]

Done.

+            ['exclude', '.*'],
+            ['include', '^audio/audio_buffers_state\\.cc$'],
+            ['include', '^audio/audio_input_controller\\.cc$'],
+            ['include', '^audio/audio_input_controller\\.h$'],

[stuartmorgan, 2012/09/05 11:10:19]

Combine these into:
['include', '^audio/audio_input_controller\\.'],
Same for all other cc/h pairs.

[blundell, 2012/09/05 12:04:29]

Done.

+            ['include', '^audio/audio_io\\.h$'],
+            ['include', '^audio/audio_manager\\.cc$'],
+            ['include', '^audio/audio_manager\\.h$'],
+            ['include', '^audio/audio_manager_base\\.cc$'],
+            ['include', '^audio/audio_manager_base\\.h$'],
+            ['include', '^audio/audio_parameters\\.cc$'],
+            ['include', '^audio/audio_parameters\\.h$'],
+            ['include', '^audio/fake_audio_input_stream\\.cc$'],
+            ['include', '^audio/fake_audio_input_stream\\.h$'],
+            ['include', '^audio/fake_audio_output_stream\\.cc$'],
+            ['include', '^audio/fake_audio_output_stream\\.h$'],
+            ['include', '^base/channel_layout\\.cc$'],
+            ['include', '^base/channel_layout\\.h$'],
+            ['include', '^base/media\\.h$'],
+            ['include', '^base/media_ios\\.cc$'],
+        ],

[stuartmorgan, 2012/09/05 11:10:19]

Indent 2 more.

[blundell, 2012/09/05 12:04:29]

Done.

+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
+              '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
+            ],
+          },
+        }],
+        # Android and iOS don't use ffmpeg, so make the dependency conditional.

[stuartmorgan, 2012/09/05 11:10:19]

Remove everything from the ',' on.

[blundell, 2012/09/05 12:04:29]

Done.

+        ['OS != "android" and OS != "ios"', {
           'dependencies': [
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
         }],
+        # On Android, exclude the sources that depend on ffmpeg.
         ['OS == "android"', {
           'sources!': [
             'base/media_posix.cc',
@@ -498,8 +543,6 @@
       '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',
@@ -576,7 +619,27 @@
         'webm/webm_parser_unittest.cc',
       ],
       'conditions': [
-        ['os_posix==1 and OS!="mac"', {
+        ['OS != "ios"', {
+          'dependencies': [
+            'shared_memory_support',
+            'yuv_convert',
+          ],
+        }],
+        ['OS == "ios"', {
+          'sources/': [
+            ['exclude', '.*'],
+            ['include', '^audio/audio_parameters_unittest\\.cc$'],
+            ['include', '^base/mock_reader\\.h$'],
+            ['include', '^base/run_all_unittests\\.cc$'],
+          ],
+        }],
+        # Android and iOS don't use ffmpeg, so make the dependency conditional.

[stuartmorgan, 2012/09/05 11:10:19]

Same as above.

[blundell, 2012/09/05 12:04:29]

Done.

+        ['OS != "android" and OS != "ios"', {
+          'dependencies': [
+            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+          ],
+        }],
+        ['os_posix==1 and OS!="mac" and OS!="ios"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
@@ -609,10 +672,6 @@
               ],
             }],
           ],
-        }, {  # OS!=android
-          'dependencies': [
-            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-          ],
         }],
         ['OS == "linux"', {
           'conditions': [