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

Side by Side Diff: third_party/libjingle/libjingle_nacl.gyp

Issue 435823002: Revert "Update webrtc&libjingle 6774:6799." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
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 'libjingle_source': "source", 7 'libjingle_source': "source",
8 'webrtc_base': "../webrtc/base",
9 }, 8 },
10 'includes': [ 9 'includes': [
11 '../../native_client/build/untrusted.gypi', 10 '../../native_client/build/untrusted.gypi',
12 ], 11 ],
13 'targets': [ 12 'targets': [
14 { 13 {
15 'target_name': 'libjingle_nacl', 14 'target_name': 'libjingle_nacl',
16 'type': 'none', 15 'type': 'none',
17 'variables': { 16 'variables': {
18 'nlib_target': 'libjingle_nacl.a', 17 'nlib_target': 'libjingle_nacl.a',
(...skipping 11 matching lines...) Expand all
30 'libjingle_p2p_constants_nacl', 29 'libjingle_p2p_constants_nacl',
31 ], 30 ],
32 'defines': [ 31 'defines': [
33 'EXPAT_RELATIVE_PATH', 32 'EXPAT_RELATIVE_PATH',
34 'FEATURE_ENABLE_SSL', 33 'FEATURE_ENABLE_SSL',
35 'GTEST_RELATIVE_PATH', 34 'GTEST_RELATIVE_PATH',
36 'HAVE_OPENSSL_SSL_H', 35 'HAVE_OPENSSL_SSL_H',
37 'NO_MAIN_THREAD_WRAPPING', 36 'NO_MAIN_THREAD_WRAPPING',
38 'NO_SOUND_SYSTEM', 37 'NO_SOUND_SYSTEM',
39 'POSIX', 38 'POSIX',
40 'WEBRTC_POSIX',
41 'SRTP_RELATIVE_PATH', 39 'SRTP_RELATIVE_PATH',
42 'SSL_USE_OPENSSL', 40 'SSL_USE_OPENSSL',
43 'USE_WEBRTC_DEV_BRANCH', 41 'USE_WEBRTC_DEV_BRANCH',
44 'timezone=_timezone', 42 'timezone=_timezone',
45 ], 43 ],
46 'configurations': { 44 'configurations': {
47 'Debug': { 45 'Debug': {
48 'defines': [ 46 'defines': [
49 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of 47 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
50 # _DEBUG and remove this define. See below as well. 48 # _DEBUG and remove this define. See below as well.
51 '_DEBUG', 49 '_DEBUG',
52 ], 50 ],
53 } 51 }
54 }, 52 },
55 'include_dirs': [ 53 'include_dirs': [
56 './<(libjingle_source)', 54 './<(libjingle_source)',
57 '../',
58 ], 55 ],
59 'includes': ['libjingle_common.gypi', ], 56 'includes': ['libjingle_common.gypi', ],
60 'sources': [
61 '<(webrtc_base)/asyncfile.cc',
62 '<(webrtc_base)/asyncfile.h',
63 '<(webrtc_base)/asynchttprequest.cc',
64 '<(webrtc_base)/asynchttprequest.h',
65 '<(webrtc_base)/asyncpacketsocket.h',
66 '<(webrtc_base)/asyncsocket.cc',
67 '<(webrtc_base)/asyncsocket.h',
68 '<(webrtc_base)/asynctcpsocket.cc',
69 '<(webrtc_base)/asynctcpsocket.h',
70 '<(webrtc_base)/asyncudpsocket.cc',
71 '<(webrtc_base)/asyncudpsocket.h',
72 '<(webrtc_base)/autodetectproxy.cc',
73 '<(webrtc_base)/autodetectproxy.h',
74 '<(webrtc_base)/base64.cc',
75 '<(webrtc_base)/base64.h',
76 '<(webrtc_base)/basicdefs.h',
77 '<(webrtc_base)/bytebuffer.cc',
78 '<(webrtc_base)/bytebuffer.h',
79 '<(webrtc_base)/byteorder.h',
80 '<(webrtc_base)/checks.cc',
81 '<(webrtc_base)/checks.h',
82 '<(webrtc_base)/common.cc',
83 '<(webrtc_base)/common.h',
84 '<(webrtc_base)/compile_assert.h',
85 '<(webrtc_base)/cpumonitor.cc',
86 '<(webrtc_base)/cpumonitor.h',
87 '<(webrtc_base)/crc32.cc',
88 '<(webrtc_base)/crc32.h',
89 '<(webrtc_base)/criticalsection.h',
90 '<(webrtc_base)/cryptstring.h',
91 '<(webrtc_base)/diskcache.cc',
92 '<(webrtc_base)/diskcache.h',
93 '<(webrtc_base)/dscp.h',
94 '<(webrtc_base)/event.cc',
95 '<(webrtc_base)/event.h',
96 '<(webrtc_base)/fileutils.cc',
97 '<(webrtc_base)/fileutils.h',
98 '<(webrtc_base)/firewallsocketserver.cc',
99 '<(webrtc_base)/firewallsocketserver.h',
100 '<(webrtc_base)/flags.cc',
101 '<(webrtc_base)/flags.h',
102 '<(webrtc_base)/helpers.cc',
103 '<(webrtc_base)/helpers.h',
104 '<(webrtc_base)/httpbase.cc',
105 '<(webrtc_base)/httpbase.h',
106 '<(webrtc_base)/httpclient.cc',
107 '<(webrtc_base)/httpclient.h',
108 '<(webrtc_base)/httpcommon-inl.h',
109 '<(webrtc_base)/httpcommon.cc',
110 '<(webrtc_base)/httpcommon.h',
111 '<(webrtc_base)/httprequest.cc',
112 '<(webrtc_base)/httprequest.h',
113 '<(webrtc_base)/ipaddress.cc',
114 '<(webrtc_base)/ipaddress.h',
115 '<(webrtc_base)/linked_ptr.h',
116 '<(webrtc_base)/logging.cc',
117 '<(webrtc_base)/logging.h',
118 '<(webrtc_base)/maccocoathreadhelper.h',
119 '<(webrtc_base)/maccocoathreadhelper.mm',
120 '<(webrtc_base)/macconversion.cc',
121 '<(webrtc_base)/macconversion.h',
122 '<(webrtc_base)/macutils.cc',
123 '<(webrtc_base)/macutils.h',
124 '<(webrtc_base)/md5.cc',
125 '<(webrtc_base)/md5.h',
126 '<(webrtc_base)/md5digest.h',
127 '<(webrtc_base)/messagedigest.cc',
128 '<(webrtc_base)/messagedigest.h',
129 '<(webrtc_base)/messagehandler.cc',
130 '<(webrtc_base)/messagehandler.h',
131 '<(webrtc_base)/messagequeue.cc',
132 '<(webrtc_base)/messagequeue.h',
133 '<(webrtc_base)/move.h',
134 '<(webrtc_base)/nethelpers.cc',
135 '<(webrtc_base)/nethelpers.h',
136 '<(webrtc_base)/network.cc',
137 '<(webrtc_base)/network.h',
138 '<(webrtc_base)/nssidentity.cc',
139 '<(webrtc_base)/nssidentity.h',
140 '<(webrtc_base)/nssstreamadapter.cc',
141 '<(webrtc_base)/nssstreamadapter.h',
142 '<(webrtc_base)/nullsocketserver.h',
143 '<(webrtc_base)/openssladapter.cc',
144 '<(webrtc_base)/openssldigest.cc',
145 '<(webrtc_base)/opensslidentity.cc',
146 '<(webrtc_base)/opensslstreamadapter.cc',
147 '<(webrtc_base)/pathutils.cc',
148 '<(webrtc_base)/pathutils.h',
149 '<(webrtc_base)/physicalsocketserver.cc',
150 '<(webrtc_base)/physicalsocketserver.h',
151 '<(webrtc_base)/proxydetect.cc',
152 '<(webrtc_base)/proxydetect.h',
153 '<(webrtc_base)/proxyinfo.cc',
154 '<(webrtc_base)/proxyinfo.h',
155 '<(webrtc_base)/ratelimiter.cc',
156 '<(webrtc_base)/ratelimiter.h',
157 '<(webrtc_base)/ratetracker.cc',
158 '<(webrtc_base)/ratetracker.h',
159 '<(webrtc_base)/schanneladapter.cc',
160 '<(webrtc_base)/schanneladapter.h',
161 '<(webrtc_base)/scoped_autorelease_pool.h',
162 '<(webrtc_base)/scoped_autorelease_pool.mm',
163 '<(webrtc_base)/scoped_ptr.h',
164 '<(webrtc_base)/sec_buffer.h',
165 '<(webrtc_base)/sha1.cc',
166 '<(webrtc_base)/sha1.h',
167 '<(webrtc_base)/sha1digest.h',
168 '<(webrtc_base)/signalthread.cc',
169 '<(webrtc_base)/signalthread.h',
170 '<(webrtc_base)/sigslot.h',
171 '<(webrtc_base)/sigslotrepeater.h',
172 '<(webrtc_base)/socket.h',
173 '<(webrtc_base)/socketadapters.cc',
174 '<(webrtc_base)/socketadapters.h',
175 '<(webrtc_base)/socketaddress.cc',
176 '<(webrtc_base)/socketaddress.h',
177 '<(webrtc_base)/socketaddresspair.cc',
178 '<(webrtc_base)/socketaddresspair.h',
179 '<(webrtc_base)/socketfactory.h',
180 '<(webrtc_base)/socketpool.cc',
181 '<(webrtc_base)/socketpool.h',
182 '<(webrtc_base)/socketserver.h',
183 '<(webrtc_base)/socketstream.cc',
184 '<(webrtc_base)/socketstream.h',
185 '<(webrtc_base)/ssladapter.cc',
186 '<(webrtc_base)/ssladapter.h',
187 '<(webrtc_base)/sslfingerprint.cc',
188 '<(webrtc_base)/sslfingerprint.h',
189 '<(webrtc_base)/sslidentity.cc',
190 '<(webrtc_base)/sslidentity.h',
191 '<(webrtc_base)/sslsocketfactory.cc',
192 '<(webrtc_base)/sslsocketfactory.h',
193 '<(webrtc_base)/sslstreamadapter.cc',
194 '<(webrtc_base)/sslstreamadapter.h',
195 '<(webrtc_base)/sslstreamadapterhelper.cc',
196 '<(webrtc_base)/sslstreamadapterhelper.h',
197 '<(webrtc_base)/stream.cc',
198 '<(webrtc_base)/stream.h',
199 '<(webrtc_base)/stringencode.cc',
200 '<(webrtc_base)/stringencode.h',
201 '<(webrtc_base)/stringutils.cc',
202 '<(webrtc_base)/stringutils.h',
203 '<(webrtc_base)/task.cc',
204 '<(webrtc_base)/task.h',
205 '<(webrtc_base)/taskparent.cc',
206 '<(webrtc_base)/taskparent.h',
207 '<(webrtc_base)/taskrunner.cc',
208 '<(webrtc_base)/taskrunner.h',
209 '<(webrtc_base)/template_util.h',
210 '<(webrtc_base)/thread.cc',
211 '<(webrtc_base)/thread.h',
212 '<(webrtc_base)/timeutils.cc',
213 '<(webrtc_base)/timeutils.h',
214 '<(webrtc_base)/timing.cc',
215 '<(webrtc_base)/timing.h',
216 '<(webrtc_base)/unixfilesystem.cc',
217 '<(webrtc_base)/unixfilesystem.h',
218 '<(webrtc_base)/urlencode.cc',
219 '<(webrtc_base)/urlencode.h',
220 '<(webrtc_base)/win32.cc',
221 '<(webrtc_base)/win32.h',
222 '<(webrtc_base)/win32filesystem.cc',
223 '<(webrtc_base)/win32filesystem.h',
224 '<(webrtc_base)/win32securityerrors.cc',
225 '<(webrtc_base)/win32window.cc',
226 '<(webrtc_base)/win32window.h',
227 '<(webrtc_base)/winfirewall.cc',
228 '<(webrtc_base)/winfirewall.h',
229 '<(webrtc_base)/winping.cc',
230 '<(webrtc_base)/winping.h',
231 '<(webrtc_base)/worker.cc',
232 '<(webrtc_base)/worker.h',
233 ],
234 'sources!': [ 57 'sources!': [
235 # Compiled as part of libjingle_p2p_constants_nacl. 58 # Compiled as part of libjingle_p2p_constants_nacl.
236 '<(libjingle_source)/talk/p2p/base/constants.cc', 59 '<(libjingle_source)/talk/p2p/base/constants.cc',
237 '<(libjingle_source)/talk/p2p/base/constants.h', 60 '<(libjingle_source)/talk/p2p/base/constants.h',
238 ], 61 ],
239 'sources/': [
240 ['exclude', '/mac[a-z]+\\.(h|cc)$'],
241 ['exclude', '/scoped_autorelease_pool\\.(h|mm)$'],
242 ],
243 'conditions': [
244 ['OS!="win"', {
245 'sources/': [
246 ['exclude', '/win[a-z0-9]+\\.(h|cc)$'],
247 ['exclude', '/schanneladapter\\.(h|cc)$'],
248 ],
249 }],
250 ],
251 'direct_dependent_settings': { 62 'direct_dependent_settings': {
252 'include_dirs': [ 63 'include_dirs': [
253 './overrides', 64 './overrides',
254 './<(libjingle_source)', 65 './<(libjingle_source)',
255 '../../third_party/webrtc/overrides', 66 '../../third_party/webrtc/overrides',
256 '../../third_party', 67 '../../third_party',
257 '../../third_party/webrtc', 68 '../../third_party/webrtc',
258 ], 69 ],
259 'defines': [ 70 'defines': [
260 'EXPAT_RELATIVE_PATH', 71 'EXPAT_RELATIVE_PATH',
261 'FEATURE_ENABLE_SSL', 72 'FEATURE_ENABLE_SSL',
262 'GTEST_RELATIVE_PATH', 73 'GTEST_RELATIVE_PATH',
263 'NO_MAIN_THREAD_WRAPPING', 74 'NO_MAIN_THREAD_WRAPPING',
264 'NO_SOUND_SYSTEM', 75 'NO_SOUND_SYSTEM',
265 'POSIX', 76 'POSIX',
266 'WEBRTC_POSIX',
267 'SRTP_RELATIVE_PATH', 77 'SRTP_RELATIVE_PATH',
268 'SSL_USE_OPENSSL', 78 'SSL_USE_OPENSSL',
269 'USE_WEBRTC_DEV_BRANCH', 79 'USE_WEBRTC_DEV_BRANCH',
270 ], 80 ],
271 }, 81 },
272 'export_dependent_settings': [ 82 'export_dependent_settings': [
273 '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untr usted', 83 '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untr usted',
274 ], 84 ],
275 }, # end of target 'libjingle_nacl' 85 }, # end of target 'libjingle_nacl'
276 86
(...skipping 18 matching lines...) Expand all
295 'include_dirs': [ 105 'include_dirs': [
296 './<(libjingle_source)', 106 './<(libjingle_source)',
297 ], 107 ],
298 'sources': [ 108 'sources': [
299 '<(libjingle_source)/talk/p2p/base/constants.cc', 109 '<(libjingle_source)/talk/p2p/base/constants.cc',
300 '<(libjingle_source)/talk/p2p/base/constants.h', 110 '<(libjingle_source)/talk/p2p/base/constants.h',
301 ], 111 ],
302 }, # end of target 'libjingle_p2p_constants_nacl' 112 }, # end of target 'libjingle_p2p_constants_nacl'
303 ], 113 ],
304 } 114 }
OLDNEW
« no previous file with comments | « third_party/libjingle/libjingle_common.gypi ('k') | third_party/libjingle/overrides/init_webrtc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698