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

GN: Update xmpp and p2p to match Chromium build

Browse Source 
Manual review shows that several more sources should be excluded for the
Chromium build. This is likely what's blocking
https://codereview.chromium.org/2022833002/

It was also discovered that the following were missing from GYP+GN:
webrtc/p2p/base/dtlstransport.h
webrtc/p2p/base/session.cc
webrtc/p2p/base/session.h

BUG=webrtc:4256
TBR=pthatcher@webrtc.org
NOTRY=True
NOPRESUBMIT=True

Review-Url: https://codereview.webrtc.org/2077883002
Cr-Commit-Position: refs/heads/master@{#13200}
This commit is contained in:
kjellander
2016-06-18 04:23:01 -07:00
committed by Commit bot
parent a935574b27
commit 5023d41cb4
4 changed files with 133 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
webrtc/libjingle/xmpp/BUILD.gn
View File

@ -34,59 +34,17 @@ source_set("rtc_xmpp") {
cflags = []
sources = [
"asyncsocket.h",
"chatroommodule.h",
"chatroommoduleimpl.cc",
"constants.cc",
"constants.h",
"discoitemsquerytask.cc",
"discoitemsquerytask.h",
"hangoutpubsubclient.cc",
"hangoutpubsubclient.h",
"iqtask.cc",
"iqtask.h",
"jid.cc",
"jid.h",
"module.h",
"moduleimpl.cc",
"moduleimpl.h",
"mucroomconfigtask.cc",
"mucroomconfigtask.h",
"mucroomdiscoverytask.cc",
"mucroomdiscoverytask.h",
"mucroomlookuptask.cc",
"mucroomlookuptask.h",
"mucroomuniquehangoutidtask.cc",
"mucroomuniquehangoutidtask.h",
"pingtask.cc",
"pingtask.h",
"plainsaslhandler.h",
"presenceouttask.cc",
"presenceouttask.h",
"presencereceivetask.cc",
"presencereceivetask.h",
"presencestatus.cc",
"presencestatus.h",
"prexmppauth.h",
"pubsub_task.cc",
"pubsub_task.h",
"pubsubclient.cc",
"pubsubclient.h",
"pubsubstateclient.cc",
"pubsubstateclient.h",
"pubsubtasks.cc",
"pubsubtasks.h",
"receivetask.cc",
"receivetask.h",
"rostermodule.h",
"rostermoduleimpl.cc",
"rostermoduleimpl.h",
"saslcookiemechanism.h",
"saslhandler.h",
"saslmechanism.cc",
"saslmechanism.h",
"saslplainmechanism.h",
"xmppauth.cc",
"xmppauth.h",
"xmppclient.cc",
"xmppclient.h",
"xmppclientsettings.h",
@ -96,16 +54,10 @@ source_set("rtc_xmpp") {
"xmppengineimpl_iq.cc",
"xmpplogintask.cc",
"xmpplogintask.h",
"xmpppump.cc",
"xmpppump.h",
"xmppsocket.cc",
"xmppsocket.h",
"xmppstanzaparser.cc",
"xmppstanzaparser.h",
"xmpptask.cc",
"xmpptask.h",
"xmppthread.cc",
"xmppthread.h",
]
defines = [ "FEATURE_ENABLE_SSL" ]
@ -132,7 +84,62 @@ source_set("rtc_xmpp") {
":xmpp_inherited_config",
]
if (!build_with_chromium) {
if (build_with_chromium) {
if (is_nacl) {
deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
}
} else {
sources += [
"chatroommodule.h",
"chatroommoduleimpl.cc",
"discoitemsquerytask.cc",
"discoitemsquerytask.h",
"hangoutpubsubclient.cc",
"hangoutpubsubclient.h",
"iqtask.cc",
"iqtask.h",
"module.h",
"moduleimpl.cc",
"moduleimpl.h",
"mucroomconfigtask.cc",
"mucroomconfigtask.h",
"mucroomdiscoverytask.cc",
"mucroomdiscoverytask.h",
"mucroomlookuptask.cc",
"mucroomlookuptask.h",
"mucroomuniquehangoutidtask.cc",
"mucroomuniquehangoutidtask.h",
"pingtask.cc",
"pingtask.h",
"presenceouttask.cc",
"presenceouttask.h",
"presencereceivetask.cc",
"presencereceivetask.h",
"presencestatus.cc",
"presencestatus.h",
"pubsub_task.cc",
"pubsub_task.h",
"pubsubclient.cc",
"pubsubclient.h",
"pubsubstateclient.cc",
"pubsubstateclient.h",
"pubsubtasks.cc",
"pubsubtasks.h",
"receivetask.cc",
"receivetask.h",
"rostermodule.h",
"rostermoduleimpl.cc",
"rostermoduleimpl.h",
"xmppauth.cc",
"xmppauth.h",
"xmpppump.cc",
"xmpppump.h",
"xmppsocket.cc",
"xmppsocket.h",
"xmppthread.cc",
"xmppthread.h",
]
defines += [
"FEATURE_ENABLE_VOICEMAIL",
"FEATURE_ENABLE_PSTN",

98
webrtc/libjingle/xmpp/xmpp.gyp
View File

@ -21,59 +21,17 @@
],
'sources': [
'asyncsocket.h',
'chatroommodule.h',
'chatroommoduleimpl.cc',
'constants.cc',
'constants.h',
'discoitemsquerytask.cc',
'discoitemsquerytask.h',
'hangoutpubsubclient.cc',
'hangoutpubsubclient.h',
'iqtask.cc',
'iqtask.h',
'jid.cc',
'jid.h',
'module.h',
'moduleimpl.cc',
'moduleimpl.h',
'mucroomconfigtask.cc',
'mucroomconfigtask.h',
'mucroomdiscoverytask.cc',
'mucroomdiscoverytask.h',
'mucroomlookuptask.cc',
'mucroomlookuptask.h',
'mucroomuniquehangoutidtask.cc',
'mucroomuniquehangoutidtask.h',
'pingtask.cc',
'pingtask.h',
'plainsaslhandler.h',
'presenceouttask.cc',
'presenceouttask.h',
'presencereceivetask.cc',
'presencereceivetask.h',
'presencestatus.cc',
'presencestatus.h',
'prexmppauth.h',
'pubsub_task.cc',
'pubsub_task.h',
'pubsubclient.cc',
'pubsubclient.h',
'pubsubstateclient.cc',
'pubsubstateclient.h',
'pubsubtasks.cc',
'pubsubtasks.h',
'receivetask.cc',
'receivetask.h',
'rostermodule.h',
'rostermoduleimpl.cc',
'rostermoduleimpl.h',
'saslcookiemechanism.h',
'saslhandler.h',
'saslmechanism.cc',
'saslmechanism.h',
'saslplainmechanism.h',
'xmppauth.cc',
'xmppauth.h',
'xmppclient.cc',
'xmppclient.h',
'xmppclientsettings.h',
@ -83,16 +41,10 @@
'xmppengineimpl_iq.cc',
'xmpplogintask.cc',
'xmpplogintask.h',
'xmpppump.cc',
'xmpppump.h',
'xmppsocket.cc',
'xmppsocket.h',
'xmppstanzaparser.cc',
'xmppstanzaparser.h',
'xmpptask.cc',
'xmpptask.h',
'xmppthread.cc',
'xmppthread.h',
],
'direct_dependent_settings': {
'defines': [
@ -114,6 +66,56 @@
'FEATURE_ENABLE_VOICEMAIL',
'FEATURE_ENABLE_PSTN',
],
'sources': [
'chatroommodule.h',
'chatroommoduleimpl.cc',
'discoitemsquerytask.cc',
'discoitemsquerytask.h',
'hangoutpubsubclient.cc',
'hangoutpubsubclient.h',
'iqtask.cc',
'iqtask.h',
'module.h',
'moduleimpl.cc',
'moduleimpl.h',
'mucroomconfigtask.cc',
'mucroomconfigtask.h',
'mucroomdiscoverytask.cc',
'mucroomdiscoverytask.h',
'mucroomlookuptask.cc',
'mucroomlookuptask.h',
'mucroomuniquehangoutidtask.cc',
'mucroomuniquehangoutidtask.h',
'pingtask.cc',
'pingtask.h',
'presenceouttask.cc',
'presenceouttask.h',
'presencereceivetask.cc',
'presencereceivetask.h',
'presencestatus.cc',
'presencestatus.h',
'pubsub_task.cc',
'pubsub_task.h',
'pubsubclient.cc',
'pubsubclient.h',
'pubsubstateclient.cc',
'pubsubstateclient.h',
'pubsubtasks.cc',
'pubsubtasks.h',
'receivetask.cc',
'receivetask.h',
'rostermodule.h',
'rostermoduleimpl.cc',
'rostermoduleimpl.h',
'xmppauth.cc',
'xmppauth.h',
'xmpppump.cc',
'xmpppump.h',
'xmppsocket.cc',
'xmppsocket.h',
'xmppthread.cc',
'xmppthread.h',
]
}],
['os_posix==1', {
'configurations': {

23
webrtc/p2p/BUILD.gn
View File

@ -26,6 +26,7 @@ source_set("rtc_p2p") {
"base/basicpacketsocketfactory.h",
"base/candidate.h",
"base/common.h",
"base/dtlstransport.h",
"base/dtlstransportchannel.cc",
"base/dtlstransportchannel.h",
"base/p2pconstants.cc",
@ -44,8 +45,8 @@ source_set("rtc_p2p") {
"base/pseudotcp.h",
"base/relayport.cc",
"base/relayport.h",
"base/relayserver.cc",
"base/relayserver.h",
"base/session.cc",
"base/session.h",
"base/sessiondescription.cc",
"base/sessiondescription.h",
"base/sessionid.h",
@ -55,8 +56,6 @@ source_set("rtc_p2p") {
"base/stunport.h",
"base/stunrequest.cc",
"base/stunrequest.h",
"base/stunserver.cc",
"base/stunserver.h",
"base/tcpport.cc",
"base/tcpport.h",
"base/transport.cc",
@ -73,8 +72,6 @@ source_set("rtc_p2p") {
"base/transportinfo.h",
"base/turnport.cc",
"base/turnport.h",
"base/turnserver.cc",
"base/turnserver.h",
"base/udpport.h",
"client/basicportallocator.cc",
"client/basicportallocator.h",
@ -104,7 +101,19 @@ source_set("rtc_p2p") {
":rtc_p2p_inherited_config",
]
if (!build_with_chromium) {
if (build_with_chromium) {
if (is_nacl) {
deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
}
} else {
sources += [
"base/relayserver.cc",
"base/relayserver.h",
"base/stunserver.cc",
"base/stunserver.h",
"base/turnserver.cc",
"base/turnserver.h",
]
defines += [
"FEATURE_ENABLE_VOICEMAIL",
"FEATURE_ENABLE_PSTN",

17
webrtc/p2p/p2p.gyp
View File

@ -23,6 +23,7 @@
'base/basicpacketsocketfactory.h',
'base/candidate.h',
'base/common.h',
'base/dtlstransport.h',
'base/dtlstransportchannel.cc',
'base/dtlstransportchannel.h',
'base/p2pconstants.cc',
@ -41,8 +42,8 @@
'base/pseudotcp.h',
'base/relayport.cc',
'base/relayport.h',
'base/relayserver.cc',
'base/relayserver.h',
'base/session.cc',
'base/session.h',
'base/sessiondescription.cc',
'base/sessiondescription.h',
'base/sessionid.h',
@ -52,8 +53,6 @@
'base/stunport.h',
'base/stunrequest.cc',
'base/stunrequest.h',
'base/stunserver.cc',
'base/stunserver.h',
'base/tcpport.cc',
'base/tcpport.h',
'base/transport.cc',
@ -70,8 +69,6 @@
'base/transportinfo.h',
'base/turnport.cc',
'base/turnport.h',
'base/turnserver.cc',
'base/turnserver.h',
'base/udpport.h',
'client/basicportallocator.cc',
'client/basicportallocator.h',
@ -87,6 +84,14 @@
},
'conditions': [
['build_with_chromium==0', {
'sources': [
'base/relayserver.cc',
'base/relayserver.h',
'base/stunserver.cc',
'base/stunserver.h',
'base/turnserver.cc',
'base/turnserver.h',
],
'defines': [
'FEATURE_ENABLE_VOICEMAIL',
'FEATURE_ENABLE_PSTN',