diff options
author | ronghuawu@google.com <ronghuawu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 21:11:45 +0000 |
---|---|---|
committer | ronghuawu@google.com <ronghuawu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 21:11:45 +0000 |
commit | e113a296030026ba0c8a558f3b4cacfaf1327a61 (patch) | |
tree | ad683a4563c3daac7c25b4d90b0efd9b09113516 /third_party | |
parent | 9871081a88cc5320ea3bdaea2415dad09015e0cf (diff) | |
download | chromium_src-e113a296030026ba0c8a558f3b4cacfaf1327a61.zip chromium_src-e113a296030026ba0c8a558f3b4cacfaf1327a61.tar.gz chromium_src-e113a296030026ba0c8a558f3b4cacfaf1327a61.tar.bz2 |
Add the target to build peerconnection native in libjingle.gyp.
TEST=Unittests
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=107031
Review URL: http://codereview.chromium.org/8374014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r-- | third_party/libjingle/libjingle.gyp | 50 |
1 files changed, 40 insertions, 10 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 7d6fb61..d9e5a77 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -16,9 +16,11 @@ '_USE_32BIT_TIME_T', 'SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS', 'EXPAT_RELATIVE_PATH', + 'JSONCPP_RELATIVE_PATH', 'WEBRTC_RELATIVE_PATH', 'HAVE_WEBRTC_VIDEO', 'HAVE_WEBRTC_VOICE', + 'NO_SOUND_SYSTEM', ], 'configurations': { 'Debug': { @@ -34,12 +36,12 @@ './source', ], 'dependencies': [ - '../expat/expat.gyp:expat', - '../../base/base.gyp:base', - '../../net/net.gyp:net', + '<(DEPTH)/base/base.gyp:base', + '<(DEPTH)/net/net.gyp:net', + '<(DEPTH)/third_party/expat/expat.gyp:expat', ], 'export_dependent_settings': [ - '../expat/expat.gyp:expat', + '<(DEPTH)/third_party/expat/expat.gyp:expat', ], 'direct_dependent_settings': { 'include_dirs': [ @@ -50,7 +52,9 @@ 'FEATURE_ENABLE_SSL', 'FEATURE_ENABLE_VOICEMAIL', 'EXPAT_RELATIVE_PATH', + 'JSONCPP_RELATIVE_PATH', 'WEBRTC_RELATIVE_PATH', + 'NO_SOUND_SYSTEM', ], 'conditions': [ ['OS=="win"', { @@ -209,6 +213,8 @@ 'source/talk/base/httpcommon.h', 'source/talk/base/httprequest.cc', 'source/talk/base/httprequest.h', + 'source/talk/base/json.cc', + 'source/talk/base/json.h', 'source/talk/base/linked_ptr.h', 'source/talk/base/logging.cc', 'source/talk/base/md5.h', @@ -273,6 +279,8 @@ 'source/talk/base/time.h', 'source/talk/base/urlencode.cc', 'source/talk/base/urlencode.h', + 'source/talk/base/worker.cc', + 'source/talk/base/worker.h', 'source/talk/xmllite/xmlbuilder.cc', 'source/talk/xmllite/xmlbuilder.h', 'source/talk/xmllite/xmlconstants.cc', @@ -342,6 +350,8 @@ }], ['OS=="linux"', { 'sources': [ + 'source/talk/base/latebindingsymboltable.cc', + 'source/talk/base/latebindingsymboltable.h', 'source/talk/base/linux.cc', 'source/talk/base/linux.h', ], @@ -355,6 +365,12 @@ ], }], ], + 'dependencies': [ + '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', + ], + 'export_dependent_settings': [ + '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', + ], }, # target libjingle # This has to be is a separate project due to a bug in MSVS: # https://connect.microsoft.com/VisualStudio/feedback/details/368272/duplicate-cpp-filename-in-c-project-visual-studio-2008 @@ -434,10 +450,16 @@ 'type': 'static_library', 'sources': [ 'source/talk/app/webrtc/peerconnection.h', - 'source/talk/app/webrtc/peerconnectionfactory.h', 'source/talk/app/webrtc/peerconnectionfactory.cc', + 'source/talk/app/webrtc/peerconnectionfactory.h', + 'source/talk/app/webrtc/peerconnectionimpl.cc', + 'source/talk/app/webrtc/peerconnectionimpl.h', 'source/talk/app/webrtc/peerconnectionproxy.cc', 'source/talk/app/webrtc/peerconnectionproxy.h', + 'source/talk/app/webrtc/webrtcsession.cc', + 'source/talk/app/webrtc/webrtcsession.h', + 'source/talk/app/webrtc/webrtcjson.cc', + 'source/talk/app/webrtc/webrtcjson.h', 'source/talk/session/phone/audiomonitor.cc', 'source/talk/session/phone/audiomonitor.h', 'source/talk/session/phone/call.cc', @@ -451,6 +473,8 @@ 'source/talk/session/phone/cryptoparams.h', 'source/talk/session/phone/currentspeakermonitor.cc', 'source/talk/session/phone/currentspeakermonitor.h', + 'source/talk/session/phone/devicemanager.cc', + 'source/talk/session/phone/devicemanager.h', 'source/talk/session/phone/filemediaengine.cc', 'source/talk/session/phone/filemediaengine.h', 'source/talk/session/phone/mediachannel.h', @@ -461,6 +485,7 @@ 'source/talk/session/phone/mediamonitor.cc', 'source/talk/session/phone/mediamonitor.h', 'source/talk/session/phone/mediasession.cc', + 'source/talk/session/phone/mediasession.h', 'source/talk/session/phone/mediasessionclient.cc', 'source/talk/session/phone/mediasessionclient.h', 'source/talk/session/phone/mediasink.h', @@ -478,17 +503,22 @@ 'source/talk/session/phone/voicechannel.h', 'source/talk/session/phone/webrtccommon.h', 'source/talk/session/phone/webrtcpassthroughrender.cc', + 'source/talk/session/phone/webrtcvideoengine.cc', + 'source/talk/session/phone/webrtcvideoengine.h', 'source/talk/session/phone/webrtcvideoframe.cc', 'source/talk/session/phone/webrtcvideoframe.h', 'source/talk/session/phone/webrtcvie.h', 'source/talk/session/phone/webrtcvoe.h', + 'source/talk/session/phone/webrtcvoiceengine.cc', + 'source/talk/session/phone/webrtcvoiceengine.h', ], 'dependencies': [ - '../../third_party/webrtc/modules/modules.gyp:video_capture_module', - '../../third_party/webrtc/modules/modules.gyp:video_render_module', - '../../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core', - '../../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core', - '../../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_module', + '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module', + '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_core', + '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core', + '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers', + 'libjingle', 'libjingle_p2p', ], }, # target libjingle_peerconnection |