Move talk/media to webrtc/media

talk/libjingle.gyp

Index: talk/libjingle.gyp
diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp
index 32548080ece3b2635b13b3c7c3e5532a1880e369..ba2935ee2fefe5f8b958ad13e4c07a1eb3417ce1 100755
--- a/talk/libjingle.gyp
+++ b/talk/libjingle.gyp
@@ -440,272 +440,11 @@
 
   'targets': [
     {
-      'target_name': 'libjingle',
-      'type': 'none',
-      'dependencies': [
-        '<(webrtc_root)/base/base.gyp:rtc_base',
-      ],
-      'conditions': [
-        ['build_json==1', {
-          'dependencies': [
-            '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
-          ],
-          'export_dependent_settings': [
-            '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
-          ],
-        }],
-        ['build_expat==1', {
-          'dependencies': [
-            '<(DEPTH)/third_party/expat/expat.gyp:expat',
-          ],
-          'export_dependent_settings': [
-            '<(DEPTH)/third_party/expat/expat.gyp:expat',
-          ],
-        }],
-      ],
-    },  # target libjingle
-    {
-      'target_name': 'libjingle_media',
-      'type': 'static_library',
-      'dependencies': [
-        '<(webrtc_root)/common.gyp:webrtc_common',
-        '<(webrtc_root)/modules/modules.gyp:video_render_module',
-        '<(webrtc_root)/webrtc.gyp:webrtc',
-        '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
-        '<(webrtc_root)/sound/sound.gyp:rtc_sound',
-        '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
-        '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
-        '<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
-        '<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
-        '<(webrtc_root)/p2p/p2p.gyp:rtc_p2p',
-        'libjingle',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(libyuv_dir)/include',
-        ],
-      },
-      'sources': [
-        'media/base/audioframe.h',
-        'media/base/audiorenderer.h',
-        'media/base/capturemanager.cc',
-        'media/base/capturemanager.h',
-        'media/base/capturerenderadapter.cc',
-        'media/base/capturerenderadapter.h',
-        'media/base/codec.cc',
-        'media/base/codec.h',
-        'media/base/constants.cc',
-        'media/base/constants.h',
-        'media/base/cpuid.cc',
-        'media/base/cpuid.h',
-        'media/base/cryptoparams.h',
-        'media/base/device.h',
-        'media/base/fakescreencapturerfactory.h',
-        'media/base/hybriddataengine.h',
-        'media/base/mediachannel.h',
-        'media/base/mediacommon.h',
-        'media/base/mediaengine.cc',
-        'media/base/mediaengine.h',
-        'media/base/rtpdataengine.cc',
-        'media/base/rtpdataengine.h',
-        'media/base/rtpdump.cc',
-        'media/base/rtpdump.h',
-        'media/base/rtputils.cc',
-        'media/base/rtputils.h',
-        'media/base/screencastid.h',
-        'media/base/streamparams.cc',
-        'media/base/streamparams.h',
-        'media/base/turnutils.cc',
-        'media/base/turnutils.h',
-        'media/base/videoadapter.cc',
-        'media/base/videoadapter.h',
-        'media/base/videocapturer.cc',
-        'media/base/videocapturer.h',
-        'media/base/videocapturerfactory.h',
-        'media/base/videocommon.cc',
-        'media/base/videocommon.h',
-        'media/base/videoframe.cc',
-        'media/base/videoframe.h',
-        'media/base/videoframefactory.cc',
-        'media/base/videoframefactory.h',
-        'media/base/videorenderer.h',
-        'media/base/yuvframegenerator.cc',
-        'media/base/yuvframegenerator.h',
-        'media/devices/deviceinfo.h',
-        'media/devices/devicemanager.cc',
-        'media/devices/devicemanager.h',
-        'media/devices/dummydevicemanager.h',
-        'media/devices/filevideocapturer.cc',
-        'media/devices/filevideocapturer.h',
-        'media/devices/videorendererfactory.h',
-        'media/devices/yuvframescapturer.cc',
-        'media/devices/yuvframescapturer.h',
-        'media/sctp/sctpdataengine.cc',
-        'media/sctp/sctpdataengine.h',
-        'media/webrtc/nullwebrtcvideoengine.h',
-        'media/webrtc/simulcast.cc',
-        'media/webrtc/simulcast.h',
-        'media/webrtc/webrtccommon.h',
-        'media/webrtc/webrtcmediaengine.cc',
-        'media/webrtc/webrtcmediaengine.h',
-        'media/webrtc/webrtcmediaengine.cc',
-        'media/webrtc/webrtcvideocapturer.cc',
-        'media/webrtc/webrtcvideocapturer.h',
-        'media/webrtc/webrtcvideocapturerfactory.h',
-        'media/webrtc/webrtcvideocapturerfactory.cc',
-        'media/webrtc/webrtcvideodecoderfactory.h',
-        'media/webrtc/webrtcvideoencoderfactory.h',
-        'media/webrtc/webrtcvideoengine2.cc',
-        'media/webrtc/webrtcvideoengine2.h',
-        'media/webrtc/webrtcvideoframe.cc',
-        'media/webrtc/webrtcvideoframe.h',
-        'media/webrtc/webrtcvideoframefactory.cc',
-        'media/webrtc/webrtcvideoframefactory.h',
-        'media/webrtc/webrtcvoe.h',
-        'media/webrtc/webrtcvoiceengine.cc',
-        'media/webrtc/webrtcvoiceengine.h',
-      ],
-      'conditions': [
-        ['build_libyuv==1', {
-          'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',],
-        }],
-        ['build_usrsctp==1', {
-          'include_dirs': [
-            # TODO(jiayl): move this into the direct_dependent_settings of
-            # usrsctp.gyp.
-            '<(DEPTH)/third_party/usrsctp/usrsctplib',
-          ],
-          'dependencies': [
-            '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib',
-          ],
-        }],
-        ['build_with_chromium==1', {
-          'dependencies': [
-            '<(webrtc_root)/modules/modules.gyp:video_capture',
-            '<(webrtc_root)/modules/modules.gyp:video_render',
-          ],
-        }, {
-          'dependencies': [
-            '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl',
-            '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_impl',
-          ],
-        }],
-        ['OS=="linux"', {
-          'sources': [
-            'media/devices/libudevsymboltable.cc',
-            'media/devices/libudevsymboltable.h',
-            'media/devices/linuxdeviceinfo.cc',
-            'media/devices/linuxdevicemanager.cc',
-            'media/devices/linuxdevicemanager.h',
-            'media/devices/v4llookup.cc',
-            'media/devices/v4llookup.h',
-          ],
-          'conditions': [
-            ['use_gtk==1', {
-              'sources': [
-                'media/devices/gtkvideorenderer.cc',
-                'media/devices/gtkvideorenderer.h',
-              ],
-              'cflags': [
-                '<!@(pkg-config --cflags gobject-2.0 gthread-2.0 gtk+-2.0)',
-              ],
-            }],
-          ],
-          'include_dirs': [
-            'third_party/libudev'
-          ],
-          'libraries': [
-            '-lrt',
-          ],
-        }],
-        ['OS=="win"', {
-          'sources': [
-            'media/devices/gdivideorenderer.cc',
-            'media/devices/gdivideorenderer.h',
-            'media/devices/win32deviceinfo.cc',
-            'media/devices/win32devicemanager.cc',
-            'media/devices/win32devicemanager.h',
-          ],
-          'msvs_settings': {
-            'VCLibrarianTool': {
-              'AdditionalDependencies': [
-                'd3d9.lib',
-                'gdi32.lib',
-                'strmiids.lib',
-                'winmm.lib',
-              ],
-            },
-          },
-        }],
-        ['OS=="mac"', {
-          'sources': [
-            'media/devices/macdeviceinfo.cc',
-            'media/devices/macdevicemanager.cc',
-            'media/devices/macdevicemanager.h',
-            'media/devices/macdevicemanagermm.mm',
-          ],
-          'conditions': [
-            ['target_arch=="ia32"', {
-              'sources': [
-                'media/devices/carbonvideorenderer.cc',
-                'media/devices/carbonvideorenderer.h',
-              ],
-              'link_settings': {
-                'xcode_settings': {
-                  'OTHER_LDFLAGS': [
-                    '-framework Carbon',
-                  ],
-                },
-              },
-            }],
-          ],
-          'xcode_settings': {
-            'WARNING_CFLAGS': [
-              # TODO(ronghuawu): Update macdevicemanager.cc to stop using
-              # deprecated functions and remove this flag.
-              '-Wno-deprecated-declarations',
-            ],
-            # Disable partial availability warning to prevent errors
-            # in macdevicemanagermm.mm using AVFoundation.
-            # https://code.google.com/p/webrtc/issues/detail?id=4695
-            'WARNING_CFLAGS!': ['-Wpartial-availability'],
-          },
-          'link_settings': {
-            'xcode_settings': {
-              'OTHER_LDFLAGS': [
-                '-weak_framework AVFoundation',
-                '-framework Cocoa',
-                '-framework CoreAudio',
-                '-framework CoreVideo',
-                '-framework OpenGL',
-                '-framework QTKit',
-              ],
-            },
-          },
-        }],
-        ['OS=="ios"', {
-          'sources': [
-            'media/devices/mobiledevicemanager.cc',
-          ],
-          'include_dirs': [
-            # TODO(sjlee) Remove when vp8 is building for iOS.  vp8 pulls in
-            # libjpeg which pulls in libyuv which currently disabled.
-            '../third_party/libyuv/include',
-          ],
-        }],
-        ['OS=="android"', {
-          'sources': [
-            'media/devices/mobiledevicemanager.cc',
-          ],
-        }],
-      ],
-    },  # target libjingle_media
-    {
       'target_name': 'libjingle_p2p',
       'type': 'static_library',
       'dependencies': [
-        'libjingle',
-        'libjingle_media',
+        '<(webrtc_root)/base/base.gyp:rtc_base',
+        '<(webrtc_root)/media/media.gyp:rtc_media',
       ],
       'conditions': [
         ['build_libsrtp==1', {
@@ -755,8 +494,8 @@
       'target_name': 'libjingle_peerconnection',
       'type': 'static_library',
       'dependencies': [
-        'libjingle',
-        'libjingle_media',
+        '<(webrtc_root)/base/base.gyp:rtc_base',
+        '<(webrtc_root)/media/media.gyp:rtc_media',
         'libjingle_p2p',
       ],
       'sources': [