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

Unified Diff: webrtc/base/base.gyp

Issue 1980003002: Separate building and enabling libevent. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Move gyp define 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 4564504aabf01390c1a12829b73a7145b53f0744..858baed7152f935932cb7bd640be1a369eea9b97 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -84,11 +84,7 @@
'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',
@@ -121,17 +117,29 @@
'dependencies': [
'<(DEPTH)/base/third_party/libevent/libevent.gyp:libevent',
],
+ }],
+ ['enable_libevent==1', {
+ 'sources': [
+ 'task_queue_libevent.cc',
+ 'task_queue_posix.cc',
+ ],
+ 'defines': [
+ 'WEBRTC_BUILD_LIBEVENT',
+ ],
}, {
- 'sources!': [ 'task_queue_libevent.cc' ],
+ # If not libevent, fall back to the other task queues.
'conditions': [
- ['OS=="linux" or OS=="android"', {
- 'sources!': [ 'task_queue_posix.cc' ],
+ ['OS=="mac" or OS=="ios"', {
+ 'sources': [
+ 'task_queue_gcd.cc',
+ 'task_queue_posix.cc',
+ ],
}],
+ ['OS=="win"', {
+ 'sources': [ 'task_queue_win.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': {
'xcode_settings': {
« webrtc/base/BUILD.gn ('K') | « webrtc/base/BUILD.gn ('k') | webrtc/build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698