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

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

Issue 1323243006: Roll WebRTC 10010:10022, Libjingle 10011:10022 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed DEPS that were being unintentionally modified by git merge Created 5 years, 2 months 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/README.chromium ('k') | no next file » | 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", 8 'webrtc_p2p': "../webrtc/p2p",
9 'webrtc_xmpp': "../webrtc/libjingle/xmpp", 9 'webrtc_xmpp': "../webrtc/libjingle/xmpp",
10 }, 10 },
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 '<(webrtc_p2p)/base/stunport.h', 47 '<(webrtc_p2p)/base/stunport.h',
48 '<(webrtc_p2p)/base/stunrequest.cc', 48 '<(webrtc_p2p)/base/stunrequest.cc',
49 '<(webrtc_p2p)/base/stunrequest.h', 49 '<(webrtc_p2p)/base/stunrequest.h',
50 '<(webrtc_p2p)/base/tcpport.cc', 50 '<(webrtc_p2p)/base/tcpport.cc',
51 '<(webrtc_p2p)/base/tcpport.h', 51 '<(webrtc_p2p)/base/tcpport.h',
52 '<(webrtc_p2p)/base/transport.cc', 52 '<(webrtc_p2p)/base/transport.cc',
53 '<(webrtc_p2p)/base/transport.h', 53 '<(webrtc_p2p)/base/transport.h',
54 '<(webrtc_p2p)/base/transportchannel.cc', 54 '<(webrtc_p2p)/base/transportchannel.cc',
55 '<(webrtc_p2p)/base/transportchannel.h', 55 '<(webrtc_p2p)/base/transportchannel.h',
56 '<(webrtc_p2p)/base/transportchannelimpl.h', 56 '<(webrtc_p2p)/base/transportchannelimpl.h',
57 '<(webrtc_p2p)/base/transportchannelproxy.cc', 57 '<(webrtc_p2p)/base/transportcontroller.cc',
58 '<(webrtc_p2p)/base/transportchannelproxy.h', 58 '<(webrtc_p2p)/base/transportcontroller.h',
59 '<(webrtc_p2p)/base/transportdescription.cc', 59 '<(webrtc_p2p)/base/transportdescription.cc',
60 '<(webrtc_p2p)/base/transportdescription.h', 60 '<(webrtc_p2p)/base/transportdescription.h',
61 '<(webrtc_p2p)/base/transportdescriptionfactory.cc', 61 '<(webrtc_p2p)/base/transportdescriptionfactory.cc',
62 '<(webrtc_p2p)/base/transportdescriptionfactory.h', 62 '<(webrtc_p2p)/base/transportdescriptionfactory.h',
63 '<(webrtc_p2p)/base/turnport.cc', 63 '<(webrtc_p2p)/base/turnport.cc',
64 '<(webrtc_p2p)/base/turnport.h', 64 '<(webrtc_p2p)/base/turnport.h',
65 '<(webrtc_p2p)/client/basicportallocator.cc', 65 '<(webrtc_p2p)/client/basicportallocator.cc',
66 '<(webrtc_p2p)/client/basicportallocator.h', 66 '<(webrtc_p2p)/client/basicportallocator.h',
67 '<(webrtc_p2p)/client/httpportallocator.cc', 67 '<(webrtc_p2p)/client/httpportallocator.cc',
68 '<(webrtc_p2p)/client/httpportallocator.h', 68 '<(webrtc_p2p)/client/httpportallocator.h',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 ['exclude', '/scoped_autorelease_pool\\.(h|mm)$'], 115 ['exclude', '/scoped_autorelease_pool\\.(h|mm)$'],
116 ], 116 ],
117 }], 117 }],
118 ['use_openssl!=1', { 118 ['use_openssl!=1', {
119 'sources/': [ 119 'sources/': [
120 ['exclude', '/openssl[a-z]+\\.(h|cc)$'], 120 ['exclude', '/openssl[a-z]+\\.(h|cc)$'],
121 ], 121 ],
122 }], 122 }],
123 ], 123 ],
124 } 124 }
OLDNEW
« no previous file with comments | « third_party/libjingle/README.chromium ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698