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

Unified Diff: webrtc/base/base.gyp

Issue 2289203002: Do not build task_queue.cc and include from webrtc_overrides in Chrome. (Closed)
Patch Set: Revert add chrome DEPS Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/BUILD.gn ('k') | webrtc/base/task_queue_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/base.gyp
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index 032281e42d88f41345f597425f64d9398f6e7e0b..5923e5993fb261049285692a8a23f6b9b65281a9 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -141,37 +141,52 @@
'sequenced_task_checker.h',
'sequenced_task_checker_impl.cc',
'sequenced_task_checker_impl.h',
- 'task_queue.h',
- 'task_queue_posix.h',
],
'conditions': [
- ['build_libevent==1', {
- 'dependencies': [
- '<(DEPTH)/base/third_party/libevent/libevent.gyp:libevent',
+ ['build_with_chromium==1', {
+ 'include_dirs': [
+ '../../webrtc_overrides'
],
- }],
- ['enable_libevent==1', {
- 'sources': [
- 'task_queue_libevent.cc',
- 'task_queue_posix.cc',
+ 'sources' : [
+ '../../webrtc_overrides/webrtc/base/task_queue.cc',
+ '../../webrtc_overrides/webrtc/base/task_queue.h',
+ ]
+ } , {
+ # If not build for chromium, use our own implementation.
+ 'sources' : [
+ 'task_queue.h',
+ 'task_queue_posix.h',
],
- 'defines': [ 'WEBRTC_BUILD_LIBEVENT' ],
- 'all_dependent_settings': {
- 'defines': [ 'WEBRTC_BUILD_LIBEVENT' ]
- },
- }, {
- # If not libevent, fall back to the other task queues.
'conditions': [
- ['OS=="mac" or OS=="ios"', {
- 'sources': [
- 'task_queue_gcd.cc',
- 'task_queue_posix.cc',
- ],
+ ['build_libevent==1', {
+ 'dependencies': [
+ '<(DEPTH)/base/third_party/libevent/libevent.gyp:libevent',
+ ],
}],
- ['OS=="win"', {
- 'sources': [ 'task_queue_win.cc' ],
- }]
- ],
+ ['enable_libevent==1', {
+ 'sources': [
+ 'task_queue_libevent.cc',
+ 'task_queue_posix.cc',
+ ],
+ 'defines': [ 'WEBRTC_BUILD_LIBEVENT' ],
+ 'all_dependent_settings': {
+ 'defines': [ 'WEBRTC_BUILD_LIBEVENT' ]
+ },
+ }, {
+ # If not libevent, fall back to the other task queues.
+ 'conditions': [
+ ['OS=="mac" or OS=="ios"', {
+ 'sources': [
+ 'task_queue_gcd.cc',
+ 'task_queue_posix.cc',
+ ],
+ }],
+ ['OS=="win"', {
+ 'sources': [ 'task_queue_win.cc' ],
+ }]
+ ],
+ }],
+ ]
}],
],
},
« no previous file with comments | « webrtc/base/BUILD.gn ('k') | webrtc/base/task_queue_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698