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

Unified 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, 10 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 side-by-side diff with in-line comments
Download patch
Index: third_party/libjingle/libjingle.gyp
===================================================================
--- third_party/libjingle/libjingle.gyp (revision 123664)
+++ third_party/libjingle/libjingle.gyp (working copy)
@@ -196,7 +196,9 @@
'source/talk/base/basicpacketsocketfactory.h',
'source/talk/base/bytebuffer.cc',
'source/talk/base/bytebuffer.h',
- 'source/talk/base/byteorder.h',
+ # TODO(ronghuawu): Remove below overrides once below bug is fixed:
+ # http://crbug.com/115702
+ 'overrides/talk/base/byteorder.h',
'source/talk/base/checks.cc',
'source/talk/base/checks.h',
'source/talk/base/common.cc',
@@ -235,8 +237,10 @@
'source/talk/base/md5c.c',
'source/talk/base/messagehandler.cc',
'source/talk/base/messagehandler.h',
- 'source/talk/base/messagequeue.cc',
- 'source/talk/base/messagequeue.h',
+ # TODO(ronghuawu): Remove below overrides once below bug is fixed:
+ # http://crbug.com/115702
+ 'overrides/talk/base/messagequeue.cc',
+ 'overrides/talk/base/messagequeue.h',
'source/talk/base/nethelpers.cc',
'source/talk/base/nethelpers.h',
'source/talk/base/network.cc',
@@ -287,8 +291,10 @@
'source/talk/base/taskparent.h',
'source/talk/base/taskrunner.cc',
'source/talk/base/taskrunner.h',
- 'source/talk/base/thread.cc',
- 'source/talk/base/thread.h',
+ # TODO(ronghuawu): Remove below overrides once below bug is fixed:
+ # http://crbug.com/115702
+ 'overrides/talk/base/thread.cc',
+ 'overrides/talk/base/thread.h',
'source/talk/base/timeutils.cc',
'source/talk/base/timeutils.h',
'source/talk/base/timing.cc',
@@ -349,8 +355,10 @@
'overrides/talk/base/win32socketinit.cc',
'source/talk/base/schanneladapter.cc',
'source/talk/base/schanneladapter.h',
- 'source/talk/base/win32.h',
- 'source/talk/base/win32.cc',
+ # TODO(ronghuawu): Remove below overrides once below bug is fixed:
+ # http://crbug.com/115702
+ 'overrides/talk/base/win32.h',
+ 'overrides/talk/base/win32.cc',
'source/talk/base/win32filesystem.cc',
'source/talk/base/win32filesystem.h',
'source/talk/base/win32window.h',

Powered by Google App Engine
This is Rietveld 408576698