Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / libjingle.gyp

diff --git a/src/third_party/libjingle/source/talk/libjingle.gyp b/src/third_party/libjingle/source/talk/libjingle.gyp
index 6064277..335a788 100755 (executable)
--- a/src/third_party/libjingle/source/talk/libjingle.gyp
+++ b/src/third_party/libjingle/source/talk/libjingle.gyp
@@ -303,27 +303,13 @@
       'dependencies': [
         '<(DEPTH)/third_party/expat/expat.gyp:expat',
         '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
-        '<(webrtc_root)/base/base.gyp:webrtc_base',
+        '<(webrtc_root)/base/base.gyp:rtc_base',
       ],
       'export_dependent_settings': [
         '<(DEPTH)/third_party/expat/expat.gyp:expat',
         '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
       ],
       'sources': [
-        'xmllite/qname.cc',
-        'xmllite/qname.h',
-        'xmllite/xmlbuilder.cc',
-        'xmllite/xmlbuilder.h',
-        'xmllite/xmlconstants.cc',
-        'xmllite/xmlconstants.h',
-        'xmllite/xmlelement.cc',
-        'xmllite/xmlelement.h',
-        'xmllite/xmlnsstack.cc',
-        'xmllite/xmlnsstack.h',
-        'xmllite/xmlparser.cc',
-        'xmllite/xmlparser.h',
-        'xmllite/xmlprinter.cc',
-        'xmllite/xmlprinter.h',
         'xmpp/asyncsocket.h',
         'xmpp/chatroommodule.h',
         'xmpp/chatroommoduleimpl.cc',
@@ -400,48 +386,6 @@
       ],
     },  # target libjingle
     {
-      'target_name': 'libjingle_sound',
-      'type': 'static_library',
-      'dependencies': [
-        'libjingle',
-      ],
-      'sources': [
-        'sound/automaticallychosensoundsystem.h',
-        'sound/nullsoundsystem.cc',
-        'sound/nullsoundsystem.h',
-        'sound/nullsoundsystemfactory.cc',
-        'sound/nullsoundsystemfactory.h',
-        'sound/platformsoundsystem.cc',
-        'sound/platformsoundsystem.h',
-        'sound/platformsoundsystemfactory.cc',
-        'sound/platformsoundsystemfactory.h',
-        'sound/sounddevicelocator.h',
-        'sound/soundinputstreaminterface.h',
-        'sound/soundoutputstreaminterface.h',
-        'sound/soundsystemfactory.h',
-        'sound/soundsysteminterface.cc',
-        'sound/soundsysteminterface.h',
-        'sound/soundsystemproxy.cc',
-        'sound/soundsystemproxy.h',
-      ],
-      'conditions': [
-        ['OS=="linux"', {
-          'sources': [
-            'sound/alsasoundsystem.cc',
-            'sound/alsasoundsystem.h',
-            'sound/alsasymboltable.cc',
-            'sound/alsasymboltable.h',
-            'sound/linuxsoundsystem.cc',
-            'sound/linuxsoundsystem.h',
-            'sound/pulseaudiosoundsystem.cc',
-            'sound/pulseaudiosoundsystem.h',
-            'sound/pulseaudiosymboltable.cc',
-            'sound/pulseaudiosymboltable.h',
-          ],
-        }],
-      ],
-    },  # target libjingle_sound
-    {
       'target_name': 'libjingle_media',
       'type': 'static_library',
       'include_dirs': [
@@ -452,14 +396,14 @@
       'dependencies': [
         '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
         '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib',
-        '<(webrtc_root)/modules/modules.gyp:video_capture_module',
         '<(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/source/system_wrappers.gyp:system_wrappers',
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:field_trial_default',
+        '<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
         'libjingle',
-        'libjingle_sound',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
@@ -485,8 +429,6 @@
         'media/base/filemediaengine.cc',
         'media/base/filemediaengine.h',
         'media/base/hybriddataengine.h',
-        'media/base/hybridvideoengine.cc',
-        'media/base/hybridvideoengine.h',
         'media/base/mediachannel.h',
         'media/base/mediacommon.h',
         'media/base/mediaengine.cc',
@@ -531,6 +473,7 @@
         'media/webrtc/webrtcexport.h',
         'media/webrtc/webrtcmediaengine.cc',
         'media/webrtc/webrtcmediaengine.h',
+        'media/webrtc/webrtcmediaengine.cc',
         'media/webrtc/webrtcpassthroughrender.cc',
         'media/webrtc/webrtcpassthroughrender.h',
         'media/webrtc/webrtctexturevideoframe.cc',
@@ -555,6 +498,17 @@
         'media/webrtc/webrtcvoiceengine.h',
       ],
       'conditions': [
+        ['build_with_chromium==1', {
+         'dependencies': [
+            '<(webrtc_root)/modules/modules.gyp:video_capture_module_impl',
+            '<(webrtc_root)/modules/modules.gyp:video_render_module_impl',
+         ],
+       }, {
+         '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/gtkvideorenderer.cc',
@@ -630,6 +584,7 @@
           'link_settings': {
             'xcode_settings': {
               'OTHER_LDFLAGS': [
+                '-weak_framework AVFoundation',
                 '-framework Cocoa',
                 '-framework CoreAudio',
                 '-framework CoreVideo',