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

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

Issue 9455070: Remove the dependency to ws2_32.dll from talk_base::ThreadManager and talk_base::Thread. (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 9 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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'includes': [ 6 'includes': [
7 '../../build/win_precompile.gypi', 7 '../../build/win_precompile.gypi',
8 ], 8 ],
9 'target_defaults': { 9 'target_defaults': {
10 'defines': [ 10 'defines': [
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 'sources': [ 167 'sources': [
168 'overrides/talk/base/basictypes.h', 168 'overrides/talk/base/basictypes.h',
169 'overrides/talk/base/constructormagic.h', 169 'overrides/talk/base/constructormagic.h',
170 170
171 # Overrides logging.h/.cc because libjingle logging should be done to 171 # Overrides logging.h/.cc because libjingle logging should be done to
172 # the same place as the chromium logging. 172 # the same place as the chromium logging.
173 'overrides/talk/base/logging.cc', 173 'overrides/talk/base/logging.cc',
174 'overrides/talk/base/logging.h', 174 'overrides/talk/base/logging.h',
175 175
176 'overrides/talk/base/scoped_ptr.h', 176 'overrides/talk/base/scoped_ptr.h',
177
178 # TODO(ronghuawu): Remove below overrides once below bug is fixed:
179 # http://crbug.com/115702
180 'overrides/talk/base/byteorder.h',
181 'overrides/talk/base/messagequeue.cc',
182 'overrides/talk/base/messagequeue.h',
183 'overrides/talk/base/thread.cc',
184 'overrides/talk/base/thread.h',
177 185
178 'source/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h', 186 'source/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h',
179 'source/talk/base/asyncfile.cc', 187 'source/talk/base/asyncfile.cc',
180 'source/talk/base/asyncfile.h', 188 'source/talk/base/asyncfile.h',
181 'source/talk/base/asynchttprequest.cc', 189 'source/talk/base/asynchttprequest.cc',
182 'source/talk/base/asynchttprequest.h', 190 'source/talk/base/asynchttprequest.h',
183 'source/talk/base/asyncpacketsocket.h', 191 'source/talk/base/asyncpacketsocket.h',
184 'source/talk/base/asyncsocket.cc', 192 'source/talk/base/asyncsocket.cc',
185 'source/talk/base/asyncsocket.h', 193 'source/talk/base/asyncsocket.h',
186 'source/talk/base/asynctcpsocket.cc', 194 'source/talk/base/asynctcpsocket.cc',
187 'source/talk/base/asynctcpsocket.h', 195 'source/talk/base/asynctcpsocket.h',
188 'source/talk/base/asyncudpsocket.cc', 196 'source/talk/base/asyncudpsocket.cc',
189 'source/talk/base/asyncudpsocket.h', 197 'source/talk/base/asyncudpsocket.h',
190 'source/talk/base/autodetectproxy.cc', 198 'source/talk/base/autodetectproxy.cc',
191 'source/talk/base/autodetectproxy.h', 199 'source/talk/base/autodetectproxy.h',
192 'source/talk/base/base64.cc', 200 'source/talk/base/base64.cc',
193 'source/talk/base/base64.h', 201 'source/talk/base/base64.h',
194 'source/talk/base/basicdefs.h', 202 'source/talk/base/basicdefs.h',
195 'source/talk/base/basicpacketsocketfactory.cc', 203 'source/talk/base/basicpacketsocketfactory.cc',
196 'source/talk/base/basicpacketsocketfactory.h', 204 'source/talk/base/basicpacketsocketfactory.h',
197 'source/talk/base/bytebuffer.cc', 205 'source/talk/base/bytebuffer.cc',
198 'source/talk/base/bytebuffer.h', 206 'source/talk/base/bytebuffer.h',
199 'source/talk/base/byteorder.h',
200 'source/talk/base/checks.cc', 207 'source/talk/base/checks.cc',
201 'source/talk/base/checks.h', 208 'source/talk/base/checks.h',
202 'source/talk/base/common.cc', 209 'source/talk/base/common.cc',
203 'source/talk/base/common.h', 210 'source/talk/base/common.h',
204 'source/talk/base/criticalsection.h', 211 'source/talk/base/criticalsection.h',
205 'source/talk/base/cryptstring.h', 212 'source/talk/base/cryptstring.h',
206 'source/talk/base/diskcache.cc', 213 'source/talk/base/diskcache.cc',
207 'source/talk/base/diskcache.h', 214 'source/talk/base/diskcache.h',
208 'source/talk/base/event.cc', 215 'source/talk/base/event.cc',
209 'source/talk/base/event.h', 216 'source/talk/base/event.h',
(...skipping 18 matching lines...) Expand all
228 'source/talk/base/httprequest.h', 235 'source/talk/base/httprequest.h',
229 'source/talk/base/ipaddress.cc', 236 'source/talk/base/ipaddress.cc',
230 'source/talk/base/ipaddress.h', 237 'source/talk/base/ipaddress.h',
231 'source/talk/base/json.cc', 238 'source/talk/base/json.cc',
232 'source/talk/base/json.h', 239 'source/talk/base/json.h',
233 'source/talk/base/linked_ptr.h', 240 'source/talk/base/linked_ptr.h',
234 'source/talk/base/md5.h', 241 'source/talk/base/md5.h',
235 'source/talk/base/md5c.c', 242 'source/talk/base/md5c.c',
236 'source/talk/base/messagehandler.cc', 243 'source/talk/base/messagehandler.cc',
237 'source/talk/base/messagehandler.h', 244 'source/talk/base/messagehandler.h',
238 'source/talk/base/messagequeue.cc',
239 'source/talk/base/messagequeue.h',
240 'source/talk/base/nethelpers.cc', 245 'source/talk/base/nethelpers.cc',
241 'source/talk/base/nethelpers.h', 246 'source/talk/base/nethelpers.h',
242 'source/talk/base/network.cc', 247 'source/talk/base/network.cc',
243 'source/talk/base/network.h', 248 'source/talk/base/network.h',
244 'source/talk/base/pathutils.cc', 249 'source/talk/base/pathutils.cc',
245 'source/talk/base/pathutils.h', 250 'source/talk/base/pathutils.h',
246 'source/talk/base/physicalsocketserver.cc', 251 'source/talk/base/physicalsocketserver.cc',
247 'source/talk/base/physicalsocketserver.h', 252 'source/talk/base/physicalsocketserver.h',
248 'source/talk/base/proxydetect.cc', 253 'source/talk/base/proxydetect.cc',
249 'source/talk/base/proxydetect.h', 254 'source/talk/base/proxydetect.h',
(...skipping 30 matching lines...) Expand all
280 'source/talk/base/stringencode.cc', 285 'source/talk/base/stringencode.cc',
281 'source/talk/base/stringencode.h', 286 'source/talk/base/stringencode.h',
282 'source/talk/base/stringutils.cc', 287 'source/talk/base/stringutils.cc',
283 'source/talk/base/stringutils.h', 288 'source/talk/base/stringutils.h',
284 'source/talk/base/task.cc', 289 'source/talk/base/task.cc',
285 'source/talk/base/task.h', 290 'source/talk/base/task.h',
286 'source/talk/base/taskparent.cc', 291 'source/talk/base/taskparent.cc',
287 'source/talk/base/taskparent.h', 292 'source/talk/base/taskparent.h',
288 'source/talk/base/taskrunner.cc', 293 'source/talk/base/taskrunner.cc',
289 'source/talk/base/taskrunner.h', 294 'source/talk/base/taskrunner.h',
290 'source/talk/base/thread.cc',
291 'source/talk/base/thread.h',
292 'source/talk/base/timeutils.cc', 295 'source/talk/base/timeutils.cc',
293 'source/talk/base/timeutils.h', 296 'source/talk/base/timeutils.h',
294 'source/talk/base/timing.cc', 297 'source/talk/base/timing.cc',
295 'source/talk/base/timing.h', 298 'source/talk/base/timing.h',
296 'source/talk/base/urlencode.cc', 299 'source/talk/base/urlencode.cc',
297 'source/talk/base/urlencode.h', 300 'source/talk/base/urlencode.h',
298 'source/talk/base/worker.cc', 301 'source/talk/base/worker.cc',
299 'source/talk/base/worker.h', 302 'source/talk/base/worker.h',
300 'source/talk/xmllite/qname.cc', 303 'source/talk/xmllite/qname.cc',
301 'source/talk/xmllite/qname.h', 304 'source/talk/xmllite/qname.h',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 ], 345 ],
343 'export_dependent_settings': [ 346 'export_dependent_settings': [
344 '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', 347 '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
345 ], 348 ],
346 'conditions': [ 349 'conditions': [
347 ['OS=="win"', { 350 ['OS=="win"', {
348 'sources': [ 351 'sources': [
349 'overrides/talk/base/win32socketinit.cc', 352 'overrides/talk/base/win32socketinit.cc',
350 'source/talk/base/schanneladapter.cc', 353 'source/talk/base/schanneladapter.cc',
351 'source/talk/base/schanneladapter.h', 354 'source/talk/base/schanneladapter.h',
352 'source/talk/base/win32.h', 355 # TODO(ronghuawu): Remove below overrides once below bug is fixed:
353 'source/talk/base/win32.cc', 356 # http://crbug.com/115702
357 'overrides/talk/base/win32.h',
358 'overrides/talk/base/win32.cc',
354 'source/talk/base/win32filesystem.cc', 359 'source/talk/base/win32filesystem.cc',
355 'source/talk/base/win32filesystem.h', 360 'source/talk/base/win32filesystem.h',
356 'source/talk/base/win32window.h', 361 'source/talk/base/win32window.h',
357 'source/talk/base/win32window.cc', 362 'source/talk/base/win32window.cc',
358 'source/talk/base/win32securityerrors.cc', 363 'source/talk/base/win32securityerrors.cc',
359 'source/talk/base/winfirewall.cc', 364 'source/talk/base/winfirewall.cc',
360 'source/talk/base/winfirewall.h', 365 'source/talk/base/winfirewall.h',
361 'source/talk/base/winping.cc', 366 'source/talk/base/winping.cc',
362 'source/talk/base/winping.h', 367 'source/talk/base/winping.h',
363 ], 368 ],
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_eng ine_core', 603 '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_eng ine_core',
599 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers. gyp:system_wrappers', 604 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers. gyp:system_wrappers',
600 'libjingle', 605 'libjingle',
601 'libjingle_p2p', 606 'libjingle_p2p',
602 ], 607 ],
603 }], 608 }],
604 ], 609 ],
605 }, # target libjingle_peerconnection 610 }, # target libjingle_peerconnection
606 ], 611 ],
607 } 612 }
OLDNEW
« no previous file with comments | « remoting/protocol/jingle_session_unittest.cc ('k') | third_party/libjingle/overrides/talk/base/byteorder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698