zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Delete reference to webrtc_overides/rtc_base/task_queue.cc."

Browse Source 
This reverts commit 17a0474379ebba7f48a59f2952b0a184071c47d8.

Reason for revert: Blocks roll into chromium. The Chromium CL this depends on was reverted.

Original change's description:
> Delete reference to webrtc_overides/rtc_base/task_queue.cc.
> 
> This change depends on Chromium cl
> https://chromium-review.googlesource.com/c/chromium/src/+/681814,
> which must be landed first.
> 
> Bug: webrtc:8166
> Change-Id: I8e1c96ad5927e1d9d4e45e6f6c0b5f712d58cef7
> Reviewed-on: https://webrtc-review.googlesource.com/3940
> Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
> Reviewed-by: Per Kjellander <perkj@webrtc.org>
> Commit-Queue: Niels Moller <nisse@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#20071}

TBR=kjellander@webrtc.org,nisse@webrtc.org,perkj@webrtc.org

Change-Id: I8bf5a27adb6549c70d9e2b632dfeaf23fab3cdd2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:8166
Reviewed-on: https://webrtc-review.googlesource.com/5740
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20103}
This commit is contained in:
Henrik Boström
2017-10-03 08:01:07 +00:00
committed by Commit Bot
parent 4db97b9063
commit a9a277185e
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
rtc_base/BUILD.gn
View File

@ -345,26 +345,32 @@ rtc_source_set("rtc_task_queue_impl") {
":rtc_base_approved",
":rtc_task_queue_api",
]
if (rtc_build_libevent) {
deps += [ "//base/third_party/libevent" ]
}
if (rtc_enable_libevent) {
if (build_with_chromium) {
sources = [
"task_queue_libevent.cc",
"task_queue_posix.cc",
"task_queue_posix.h",
"../../webrtc_overrides/rtc_base/task_queue.cc",
]
} else {
if (is_mac || is_ios) {
sources = [
"task_queue_gcd.cc",
"task_queue_posix.cc",
]
if (rtc_build_libevent) {
deps += [ "//base/third_party/libevent" ]
}
if (is_win) {
if (rtc_enable_libevent) {
sources = [
"task_queue_win.cc",
"task_queue_libevent.cc",
"task_queue_posix.cc",
"task_queue_posix.h",
]
} else {
if (is_mac || is_ios) {
sources = [
"task_queue_gcd.cc",
"task_queue_posix.cc",
]
}
if (is_win) {
sources = [
"task_queue_win.cc",
]
}
}
}
}