Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: third_party/libjingle/libjingle_common.gypi

Issue 653203005: Roll WebRTC 7546:7549. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Decreased the number of gyp changes in this patch since thats the only major change (the reset is j… Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/libjingle/libjingle.gyp ('k') | third_party/libjingle/libjingle_nacl.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'nacl_untrusted_build%': 0, 7 'nacl_untrusted_build%': 0,
8 'webrtc_p2p': "../webrtc/p2p",
9 'webrtc_xmpp': "../webrtc/libjingle/xmpp",
8 }, 10 },
9 'sources': [ 11 'sources': [
10 '<(libjingle_source)/talk/p2p/base/asyncstuntcpsocket.cc', 12 '<(webrtc_p2p)/base/asyncstuntcpsocket.cc',
11 '<(libjingle_source)/talk/p2p/base/asyncstuntcpsocket.h', 13 '<(webrtc_p2p)/base/asyncstuntcpsocket.h',
12 '<(libjingle_source)/talk/p2p/base/basicpacketsocketfactory.cc', 14 '<(webrtc_p2p)/base/basicpacketsocketfactory.cc',
13 '<(libjingle_source)/talk/p2p/base/basicpacketsocketfactory.h', 15 '<(webrtc_p2p)/base/basicpacketsocketfactory.h',
14 '<(libjingle_source)/talk/p2p/base/candidate.h', 16 '<(webrtc_p2p)/base/candidate.h',
15 '<(libjingle_source)/talk/p2p/base/common.h', 17 '<(webrtc_p2p)/base/common.h',
16 '<(libjingle_source)/talk/p2p/base/constants.cc', 18 '<(webrtc_p2p)/base/constants.cc',
17 '<(libjingle_source)/talk/p2p/base/constants.h', 19 '<(webrtc_p2p)/base/constants.h',
18 '<(libjingle_source)/talk/p2p/base/dtlstransport.h', 20 '<(webrtc_p2p)/base/dtlstransport.h',
19 '<(libjingle_source)/talk/p2p/base/dtlstransportchannel.cc', 21 '<(webrtc_p2p)/base/dtlstransportchannel.cc',
20 '<(libjingle_source)/talk/p2p/base/dtlstransportchannel.h', 22 '<(webrtc_p2p)/base/dtlstransportchannel.h',
21 '<(libjingle_source)/talk/p2p/base/p2ptransport.cc', 23 '<(webrtc_p2p)/base/p2ptransport.cc',
22 '<(libjingle_source)/talk/p2p/base/p2ptransport.h', 24 '<(webrtc_p2p)/base/p2ptransport.h',
23 '<(libjingle_source)/talk/p2p/base/p2ptransportchannel.cc', 25 '<(webrtc_p2p)/base/p2ptransportchannel.cc',
24 '<(libjingle_source)/talk/p2p/base/p2ptransportchannel.h', 26 '<(webrtc_p2p)/base/p2ptransportchannel.h',
25 '<(libjingle_source)/talk/p2p/base/parsing.cc', 27 '<(webrtc_p2p)/base/parsing.cc',
26 '<(libjingle_source)/talk/p2p/base/parsing.h', 28 '<(webrtc_p2p)/base/parsing.h',
27 '<(libjingle_source)/talk/p2p/base/port.cc', 29 '<(webrtc_p2p)/base/port.cc',
28 '<(libjingle_source)/talk/p2p/base/port.h', 30 '<(webrtc_p2p)/base/port.h',
29 '<(libjingle_source)/talk/p2p/base/portallocator.cc', 31 '<(webrtc_p2p)/base/portallocator.cc',
30 '<(libjingle_source)/talk/p2p/base/portallocator.h', 32 '<(webrtc_p2p)/base/portallocator.h',
31 '<(libjingle_source)/talk/p2p/base/portallocatorsessionproxy.cc', 33 '<(webrtc_p2p)/base/portallocatorsessionproxy.cc',
32 '<(libjingle_source)/talk/p2p/base/portallocatorsessionproxy.h', 34 '<(webrtc_p2p)/base/portallocatorsessionproxy.h',
33 '<(libjingle_source)/talk/p2p/base/portproxy.cc', 35 '<(webrtc_p2p)/base/portproxy.cc',
34 '<(libjingle_source)/talk/p2p/base/portproxy.h', 36 '<(webrtc_p2p)/base/portproxy.h',
35 '<(libjingle_source)/talk/p2p/base/pseudotcp.cc', 37 '<(webrtc_p2p)/base/pseudotcp.cc',
36 '<(libjingle_source)/talk/p2p/base/pseudotcp.h', 38 '<(webrtc_p2p)/base/pseudotcp.h',
37 '<(libjingle_source)/talk/p2p/base/rawtransport.cc', 39 '<(webrtc_p2p)/base/rawtransport.cc',
38 '<(libjingle_source)/talk/p2p/base/rawtransport.h', 40 '<(webrtc_p2p)/base/rawtransport.h',
39 '<(libjingle_source)/talk/p2p/base/rawtransportchannel.cc', 41 '<(webrtc_p2p)/base/rawtransportchannel.cc',
40 '<(libjingle_source)/talk/p2p/base/rawtransportchannel.h', 42 '<(webrtc_p2p)/base/rawtransportchannel.h',
41 '<(libjingle_source)/talk/p2p/base/relayport.cc', 43 '<(webrtc_p2p)/base/relayport.cc',
42 '<(libjingle_source)/talk/p2p/base/relayport.h', 44 '<(webrtc_p2p)/base/relayport.h',
43 '<(libjingle_source)/talk/p2p/base/session.cc', 45 '<(webrtc_p2p)/base/session.cc',
44 '<(libjingle_source)/talk/p2p/base/session.h', 46 '<(webrtc_p2p)/base/session.h',
45 '<(libjingle_source)/talk/p2p/base/sessionclient.h', 47 '<(webrtc_p2p)/base/sessionclient.h',
46 '<(libjingle_source)/talk/p2p/base/sessiondescription.cc', 48 '<(webrtc_p2p)/base/sessiondescription.cc',
47 '<(libjingle_source)/talk/p2p/base/sessiondescription.h', 49 '<(webrtc_p2p)/base/sessiondescription.h',
48 '<(libjingle_source)/talk/p2p/base/sessionid.h', 50 '<(webrtc_p2p)/base/sessionid.h',
49 '<(libjingle_source)/talk/p2p/base/sessionmanager.cc', 51 '<(webrtc_p2p)/base/sessionmanager.cc',
50 '<(libjingle_source)/talk/p2p/base/sessionmanager.h', 52 '<(webrtc_p2p)/base/sessionmanager.h',
51 '<(libjingle_source)/talk/p2p/base/sessionmessages.cc', 53 '<(webrtc_p2p)/base/sessionmessages.cc',
52 '<(libjingle_source)/talk/p2p/base/sessionmessages.h', 54 '<(webrtc_p2p)/base/sessionmessages.h',
53 '<(libjingle_source)/talk/p2p/base/stun.cc', 55 '<(webrtc_p2p)/base/stun.cc',
54 '<(libjingle_source)/talk/p2p/base/stun.h', 56 '<(webrtc_p2p)/base/stun.h',
55 '<(libjingle_source)/talk/p2p/base/stunport.cc', 57 '<(webrtc_p2p)/base/stunport.cc',
56 '<(libjingle_source)/talk/p2p/base/stunport.h', 58 '<(webrtc_p2p)/base/stunport.h',
57 '<(libjingle_source)/talk/p2p/base/stunrequest.cc', 59 '<(webrtc_p2p)/base/stunrequest.cc',
58 '<(libjingle_source)/talk/p2p/base/stunrequest.h', 60 '<(webrtc_p2p)/base/stunrequest.h',
59 '<(libjingle_source)/talk/p2p/base/tcpport.cc', 61 '<(webrtc_p2p)/base/tcpport.cc',
60 '<(libjingle_source)/talk/p2p/base/tcpport.h', 62 '<(webrtc_p2p)/base/tcpport.h',
61 '<(libjingle_source)/talk/p2p/base/transport.cc', 63 '<(webrtc_p2p)/base/transport.cc',
62 '<(libjingle_source)/talk/p2p/base/transport.h', 64 '<(webrtc_p2p)/base/transport.h',
63 '<(libjingle_source)/talk/p2p/base/transportchannel.cc', 65 '<(webrtc_p2p)/base/transportchannel.cc',
64 '<(libjingle_source)/talk/p2p/base/transportchannel.h', 66 '<(webrtc_p2p)/base/transportchannel.h',
65 '<(libjingle_source)/talk/p2p/base/transportchannelimpl.h', 67 '<(webrtc_p2p)/base/transportchannelimpl.h',
66 '<(libjingle_source)/talk/p2p/base/transportchannelproxy.cc', 68 '<(webrtc_p2p)/base/transportchannelproxy.cc',
67 '<(libjingle_source)/talk/p2p/base/transportchannelproxy.h', 69 '<(webrtc_p2p)/base/transportchannelproxy.h',
68 '<(libjingle_source)/talk/p2p/base/transportdescription.cc', 70 '<(webrtc_p2p)/base/transportdescription.cc',
69 '<(libjingle_source)/talk/p2p/base/transportdescription.h', 71 '<(webrtc_p2p)/base/transportdescription.h',
70 '<(libjingle_source)/talk/p2p/base/transportdescriptionfactory.cc', 72 '<(webrtc_p2p)/base/transportdescriptionfactory.cc',
71 '<(libjingle_source)/talk/p2p/base/transportdescriptionfactory.h', 73 '<(webrtc_p2p)/base/transportdescriptionfactory.h',
72 '<(libjingle_source)/talk/p2p/base/turnport.cc', 74 '<(webrtc_p2p)/base/turnport.cc',
73 '<(libjingle_source)/talk/p2p/base/turnport.h', 75 '<(webrtc_p2p)/base/turnport.h',
74 '<(libjingle_source)/talk/p2p/client/basicportallocator.cc', 76 '<(webrtc_p2p)/client/basicportallocator.cc',
75 '<(libjingle_source)/talk/p2p/client/basicportallocator.h', 77 '<(webrtc_p2p)/client/basicportallocator.h',
76 '<(libjingle_source)/talk/p2p/client/httpportallocator.cc', 78 '<(webrtc_p2p)/client/httpportallocator.cc',
77 '<(libjingle_source)/talk/p2p/client/httpportallocator.h', 79 '<(webrtc_p2p)/client/httpportallocator.h',
78 '<(libjingle_source)/talk/p2p/client/sessionmanagertask.h', 80 '<(webrtc_p2p)/client/sessionmanagertask.h',
79 '<(libjingle_source)/talk/p2p/client/sessionsendtask.h', 81 '<(webrtc_p2p)/client/sessionsendtask.h',
80 '<(libjingle_source)/talk/p2p/client/socketmonitor.cc', 82 '<(webrtc_p2p)/client/socketmonitor.cc',
81 '<(libjingle_source)/talk/p2p/client/socketmonitor.h', 83 '<(webrtc_p2p)/client/socketmonitor.h',
82 '<(libjingle_source)/talk/xmpp/asyncsocket.h', 84 '<(webrtc_xmpp)/asyncsocket.h',
83 '<(libjingle_source)/talk/xmpp/constants.cc', 85 '<(webrtc_xmpp)/constants.cc',
84 '<(libjingle_source)/talk/xmpp/constants.h', 86 '<(webrtc_xmpp)/constants.h',
85 '<(libjingle_source)/talk/xmpp/jid.cc', 87 '<(webrtc_xmpp)/jid.cc',
86 '<(libjingle_source)/talk/xmpp/jid.h', 88 '<(webrtc_xmpp)/jid.h',
87 '<(libjingle_source)/talk/xmpp/plainsaslhandler.h', 89 '<(webrtc_xmpp)/plainsaslhandler.h',
88 '<(libjingle_source)/talk/xmpp/prexmppauth.h', 90 '<(webrtc_xmpp)/prexmppauth.h',
89 '<(libjingle_source)/talk/xmpp/saslcookiemechanism.h', 91 '<(webrtc_xmpp)/saslcookiemechanism.h',
90 '<(libjingle_source)/talk/xmpp/saslhandler.h', 92 '<(webrtc_xmpp)/saslhandler.h',
91 '<(libjingle_source)/talk/xmpp/saslmechanism.cc', 93 '<(webrtc_xmpp)/saslmechanism.cc',
92 '<(libjingle_source)/talk/xmpp/saslmechanism.h', 94 '<(webrtc_xmpp)/saslmechanism.h',
93 '<(libjingle_source)/talk/xmpp/saslplainmechanism.h', 95 '<(webrtc_xmpp)/saslplainmechanism.h',
94 '<(libjingle_source)/talk/xmpp/xmppclient.cc', 96 '<(webrtc_xmpp)/xmppclient.cc',
95 '<(libjingle_source)/talk/xmpp/xmppclient.h', 97 '<(webrtc_xmpp)/xmppclient.h',
96 '<(libjingle_source)/talk/xmpp/xmppclientsettings.h', 98 '<(webrtc_xmpp)/xmppclientsettings.h',
97 '<(libjingle_source)/talk/xmpp/xmppengine.h', 99 '<(webrtc_xmpp)/xmppengine.h',
98 '<(libjingle_source)/talk/xmpp/xmppengineimpl.cc', 100 '<(webrtc_xmpp)/xmppengineimpl.cc',
99 '<(libjingle_source)/talk/xmpp/xmppengineimpl.h', 101 '<(webrtc_xmpp)/xmppengineimpl.h',
100 '<(libjingle_source)/talk/xmpp/xmppengineimpl_iq.cc', 102 '<(webrtc_xmpp)/xmppengineimpl_iq.cc',
101 '<(libjingle_source)/talk/xmpp/xmpplogintask.cc', 103 '<(webrtc_xmpp)/xmpplogintask.cc',
102 '<(libjingle_source)/talk/xmpp/xmpplogintask.h', 104 '<(webrtc_xmpp)/xmpplogintask.h',
103 '<(libjingle_source)/talk/xmpp/xmppstanzaparser.cc', 105 '<(webrtc_xmpp)/xmppstanzaparser.cc',
104 '<(libjingle_source)/talk/xmpp/xmppstanzaparser.h', 106 '<(webrtc_xmpp)/xmppstanzaparser.h',
105 '<(libjingle_source)/talk/xmpp/xmpptask.cc', 107 '<(webrtc_xmpp)/xmpptask.cc',
106 '<(libjingle_source)/talk/xmpp/xmpptask.h', 108 '<(webrtc_xmpp)/xmpptask.h',
107 ], 109 ],
108 'conditions': [ 110 'conditions': [
109 ['OS=="win" and nacl_untrusted_build==0', { 111 ['OS=="win" and nacl_untrusted_build==0', {
110 # Suppress warnings about WIN32_LEAN_AND_MEAN. 112 # Suppress warnings about WIN32_LEAN_AND_MEAN.
111 'msvs_disabled_warnings': [ 4005, 4267 ], 113 'msvs_disabled_warnings': [ 4005, 4267 ],
112 }, { 114 }, {
113 'sources/': [ 115 'sources/': [
114 ['exclude', '/win[a-z0-9]+\\.(h|cc)$'], 116 ['exclude', '/win[a-z0-9]+\\.(h|cc)$'],
115 ['exclude', '/schanneladapter\\.(h|cc)$'], 117 ['exclude', '/schanneladapter\\.(h|cc)$'],
116 ], 118 ],
117 }], 119 }],
118 ['os_posix!=1 and nacl_untrusted_build==0', { 120 ['os_posix!=1 and nacl_untrusted_build==0', {
119 'sources/': [ 121 'sources/': [
120 ['exclude', '/unix[a-z]+\\.(h|cc)$'], 122 ['exclude', '/unix[a-z]+\\.(h|cc)$'],
121 ], 123 ],
122 }], 124 }],
123 ['(OS!="mac" and OS!="ios") or nacl_untrusted_build==1', { 125 ['(OS!="mac" and OS!="ios") or nacl_untrusted_build==1', {
124 'sources/': [ 126 'sources/': [
125 ['exclude', '/mac[a-z]+\\.(h|cc)$'], 127 ['exclude', '/mac[a-z]+\\.(h|cc)$'],
126 ['exclude', '/scoped_autorelease_pool\\.(h|mm)$'], 128 ['exclude', '/scoped_autorelease_pool\\.(h|mm)$'],
127 ], 129 ],
128 }], 130 }],
129 ['use_openssl!=1', { 131 ['use_openssl!=1', {
130 'sources/': [ 132 'sources/': [
131 ['exclude', '/openssl[a-z]+\\.(h|cc)$'], 133 ['exclude', '/openssl[a-z]+\\.(h|cc)$'],
132 ], 134 ],
133 }], 135 }],
134 ], 136 ],
135 } 137 }
OLDNEW
« no previous file with comments | « third_party/libjingle/libjingle.gyp ('k') | third_party/libjingle/libjingle_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698