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

Unified Diff: webrtc/base/BUILD.gn

Issue 2289203002: Do not build task_queue.cc and include from webrtc_overrides in Chrome. (Closed)
Patch Set: 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 | « no previous file | webrtc/base/base.gyp » ('j') | webrtc/base/base.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/BUILD.gn
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index ed40a42280fab33fdcb009aa6ca05233b6a962d9..7753401371e7f8466359840f66eb4cc545d06004 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -201,31 +201,37 @@ static_library("rtc_task_queue") {
"sequenced_task_checker.h",
"sequenced_task_checker_impl.cc",
"sequenced_task_checker_impl.h",
- "task_queue.h",
- "task_queue_posix.h",
]
- if (rtc_build_libevent) {
- deps = [
- "//base/third_party/libevent",
- ]
- }
-
- if (rtc_enable_libevent) {
+ if (build_with_chromium) {
+ sources += [ "../../webrtc_overrides/webrtc/base/task_queue.h" ]
tommi 2016/08/30 16:26:04 I don't think we need this
perkj_webrtc 2016/08/30 20:00:18 again- this is the same as with logging above?
+ } else {
sources += [
- "task_queue_libevent.cc",
- "task_queue_posix.cc",
+ "task_queue.h",
+ "task_queue_posix.h",
]
- all_dependent_configs = [ ":enable_libevent_config" ]
- } else {
- if (is_mac || is_ios) {
+ if (rtc_build_libevent) {
+ deps = [
+ "//base/third_party/libevent",
+ ]
+ }
+
+ if (rtc_enable_libevent) {
sources += [
- "task_queue_gcd.cc",
+ "task_queue_libevent.cc",
"task_queue_posix.cc",
]
- }
- if (is_win) {
- sources += [ "task_queue_win.cc" ]
+ all_dependent_configs = [ ":enable_libevent_config" ]
+ } else {
+ if (is_mac || is_ios) {
+ sources += [
+ "task_queue_gcd.cc",
+ "task_queue_posix.cc",
+ ]
+ }
+ if (is_win) {
+ sources += [ "task_queue_win.cc" ]
+ }
}
}
}
« no previous file with comments | « no previous file | webrtc/base/base.gyp » ('j') | webrtc/base/base.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698