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

Unified Diff: webrtc/base/base.gyp

Issue 1984503002: Reland of New task queueing primitive for async tasks: TaskQueue. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Optional initialization for build_for Created 4 years, 7 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: webrtc/base/base.gyp
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index 9cf936a57b8d6428b9ce3b2faa2380821de4404b..8eb881e8e0902f717b56f85af25b8c67815d9c6b 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -84,6 +84,12 @@
'swap_queue.h',
'systeminfo.cc',
'systeminfo.h',
+ 'task_queue.h',
+ 'task_queue_libevent.cc',
+ 'task_queue_gcd.cc',
+ 'task_queue_posix.cc',
+ 'task_queue_posix.h',
+ 'task_queue_win.cc',
'template_util.h',
'thread_annotations.h',
'thread_checker.h',
@@ -111,6 +117,24 @@
'logging.h',
'logging_mac.mm',
],
+ 'conditions': [
+ ['build_libevent==1', {
+ 'dependencies': [
+ '<(DEPTH)/base/third_party/libevent/libevent.gyp:libevent',
+ ],
+ }],
+ ],
+ }],
+ ['build_libevent!=1', {
phoglund 2016/05/16 09:59:09 Hmm, this isn't going to work since we're always f
+ 'sources!': [ 'task_queue_libevent.cc' ],
+ 'conditions': [
+ ['OS=="linux" or OS=="android"', {
+ 'sources!': [ 'task_queue_posix.cc' ],
+ }],
+ ],
+ }],
+ ['build_libevent==1 or OS=="linux" or OS=="android" or OS=="win"', {
+ 'sources!': [ 'task_queue_gcd.cc' ],
}],
['OS=="mac" and build_with_chromium==0', {
'all_dependent_settings': {
« webrtc/base/BUILD.gn ('K') | « webrtc/base/BUILD.gn ('k') | webrtc/base/base_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698