zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert 7145 "Stop building talk/sound since it is no longer used."

Browse Source 
> Stop building talk/sound since it is no longer used.
> 
> BUG=N/A
> R=pbos@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/22319004

TBR=henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/22619004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7148 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
sprang@webrtc.org
2014-09-11 08:29:53 +00:00
parent 2b58a4433f
commit c665dcb205
2 changed files with 69 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
talk/libjingle.gyp
View File

@ -399,6 +399,48 @@
'xmpp/xmppthread.h', 'xmpp/xmppthread.h',
], ],
}, # target libjingle }, # 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', 'target_name': 'libjingle_media',
'type': 'static_library', 'type': 'static_library',
@ -419,6 +461,7 @@
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:field_trial_default', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:field_trial_default',
'<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite', '<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
'libjingle', 'libjingle',
'libjingle_sound',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [

26
talk/libjingle_tests.gyp
View File

@ -103,6 +103,18 @@
'xmpp/xmppstanzaparser_unittest.cc', 'xmpp/xmppstanzaparser_unittest.cc',
], # sources ], # sources
}, # target libjingle_unittest }, # target libjingle_unittest
{
'target_name': 'libjingle_sound_unittest',
'type': 'executable',
'dependencies': [
'<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'libjingle.gyp:libjingle_sound',
'libjingle_unittest_main',
],
'sources': [
'sound/automaticallychosensoundsystem_unittest.cc',
],
}, # target libjingle_sound_unittest
{ {
'target_name': 'libjingle_media_unittest', 'target_name': 'libjingle_media_unittest',
'type': 'executable', 'type': 'executable',
@ -472,6 +484,20 @@
'libjingle_peerconnection_unittest.isolate', 'libjingle_peerconnection_unittest.isolate',
], ],
}, },
{
'target_name': 'libjingle_sound_unittest_run',
'type': 'none',
'dependencies': [
'libjingle_sound_unittest',
],
'includes': [
'build/isolate.gypi',
'libjingle_sound_unittest.isolate',
],
'sources': [
'libjingle_sound_unittest.isolate',
],
},
{ {
'target_name': 'libjingle_unittest_run', 'target_name': 'libjingle_unittest_run',
'type': 'none', 'type': 'none',