Delete rtc_task_queue_impl build target
Bug: webrtc:10191 Change-Id: I2ba660c403919708d28b5f5f2bdcffdb1e4ee486 Reviewed-on: https://webrtc-review.googlesource.com/c/124040 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26826}
This commit is contained in:

committed by
Commit Bot

parent
8721bb30d8
commit
56973e627e
@ -60,9 +60,7 @@ rtc_source_set("task_queue_test") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
rtc_source_set("default_task_queue_factory") {
|
rtc_source_set("default_task_queue_factory") {
|
||||||
# TODO(bugs.webrtc.org/10191): Make public when implemented for all
|
visibility = [ "*" ]
|
||||||
# supported platforms.
|
|
||||||
visibility = [ ":global_task_queue_factory" ]
|
|
||||||
sources = [
|
sources = [
|
||||||
"default_task_queue_factory.h",
|
"default_task_queue_factory.h",
|
||||||
]
|
]
|
||||||
@ -73,44 +71,21 @@ rtc_source_set("default_task_queue_factory") {
|
|||||||
# TODO(bugs.webrtc.org/10284): Include implementation unconditionally when
|
# TODO(bugs.webrtc.org/10284): Include implementation unconditionally when
|
||||||
# global task queue factory is removed.
|
# global task queue factory is removed.
|
||||||
if (rtc_link_task_queue_impl) {
|
if (rtc_link_task_queue_impl) {
|
||||||
deps += [ ":default_task_queue_factory_impl" ]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# TODO(bugs.webrtc.org/10191): Merge back to default_task_queue_factory when
|
|
||||||
# rtc_task_queue_impl build target is removed.
|
|
||||||
rtc_source_set("default_task_queue_factory_impl") {
|
|
||||||
# Include the implementation when rtc_link_task_queue_impl is set to default
|
|
||||||
# value of true or when explicit dependency on "rtc_task_queue_impl" is added.
|
|
||||||
visibility = [
|
|
||||||
":default_task_queue_factory",
|
|
||||||
"../../rtc_base:rtc_task_queue_impl",
|
|
||||||
]
|
|
||||||
deps = [
|
|
||||||
":task_queue_factory",
|
|
||||||
]
|
|
||||||
if (rtc_enable_libevent) {
|
if (rtc_enable_libevent) {
|
||||||
sources = [
|
sources += [ "default_task_queue_factory_libevent.cc" ]
|
||||||
"default_task_queue_factory_libevent.cc",
|
|
||||||
]
|
|
||||||
deps += [ "../../rtc_base:rtc_task_queue_libevent" ]
|
deps += [ "../../rtc_base:rtc_task_queue_libevent" ]
|
||||||
} else if (is_mac || is_ios) {
|
} else if (is_mac || is_ios) {
|
||||||
sources = [
|
sources += [ "default_task_queue_factory_gcd.cc" ]
|
||||||
"default_task_queue_factory_gcd.cc",
|
|
||||||
]
|
|
||||||
deps += [ "../../rtc_base:rtc_task_queue_gcd" ]
|
deps += [ "../../rtc_base:rtc_task_queue_gcd" ]
|
||||||
} else if (is_win && current_os != "winuwp") {
|
} else if (is_win && current_os != "winuwp") {
|
||||||
sources = [
|
sources += [ "default_task_queue_factory_win.cc" ]
|
||||||
"default_task_queue_factory_win.cc",
|
|
||||||
]
|
|
||||||
deps += [ "../../rtc_base:rtc_task_queue_win" ]
|
deps += [ "../../rtc_base:rtc_task_queue_win" ]
|
||||||
} else {
|
} else {
|
||||||
sources = [
|
sources += [ "default_task_queue_factory_stdlib.cc" ]
|
||||||
"default_task_queue_factory_stdlib.cc",
|
|
||||||
]
|
|
||||||
deps += [ "../../rtc_base:rtc_task_queue_stdlib" ]
|
deps += [ "../../rtc_base:rtc_task_queue_stdlib" ]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
# Linking with global_task_queue_factory adds link-time implementation of the
|
# Linking with global_task_queue_factory adds link-time implementation of the
|
||||||
# rtc::TaskQueue that allows run-time injection of the TaskQueue implementaion.
|
# rtc::TaskQueue that allows run-time injection of the TaskQueue implementaion.
|
||||||
|
@ -474,7 +474,10 @@ rtc_source_set("rtc_task_queue") {
|
|||||||
]
|
]
|
||||||
|
|
||||||
if (rtc_link_task_queue_impl) {
|
if (rtc_link_task_queue_impl) {
|
||||||
deps += [ ":rtc_task_queue_impl" ]
|
deps = [
|
||||||
|
"../api/task_queue:default_task_queue_factory",
|
||||||
|
"../api/task_queue:global_task_queue_factory",
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -507,7 +510,7 @@ rtc_source_set("rtc_task_queue_api") {
|
|||||||
|
|
||||||
if (rtc_enable_libevent) {
|
if (rtc_enable_libevent) {
|
||||||
rtc_source_set("rtc_task_queue_libevent") {
|
rtc_source_set("rtc_task_queue_libevent") {
|
||||||
visibility = [ "../api/task_queue:default_task_queue_factory_impl" ]
|
visibility = [ "../api/task_queue:default_task_queue_factory" ]
|
||||||
sources = [
|
sources = [
|
||||||
"task_queue_libevent.cc",
|
"task_queue_libevent.cc",
|
||||||
"task_queue_libevent.h",
|
"task_queue_libevent.h",
|
||||||
@ -534,7 +537,7 @@ if (rtc_enable_libevent) {
|
|||||||
|
|
||||||
if (is_mac || is_ios) {
|
if (is_mac || is_ios) {
|
||||||
rtc_source_set("rtc_task_queue_gcd") {
|
rtc_source_set("rtc_task_queue_gcd") {
|
||||||
visibility = [ "../api/task_queue:default_task_queue_factory_impl" ]
|
visibility = [ "../api/task_queue:default_task_queue_factory" ]
|
||||||
sources = [
|
sources = [
|
||||||
"task_queue_gcd.cc",
|
"task_queue_gcd.cc",
|
||||||
"task_queue_gcd.h",
|
"task_queue_gcd.h",
|
||||||
@ -552,7 +555,7 @@ if (is_mac || is_ios) {
|
|||||||
|
|
||||||
if (is_win) {
|
if (is_win) {
|
||||||
rtc_source_set("rtc_task_queue_win") {
|
rtc_source_set("rtc_task_queue_win") {
|
||||||
visibility = [ "../api/task_queue:default_task_queue_factory_impl" ]
|
visibility = [ "../api/task_queue:default_task_queue_factory" ]
|
||||||
sources = [
|
sources = [
|
||||||
"task_queue_win.cc",
|
"task_queue_win.cc",
|
||||||
"task_queue_win.h",
|
"task_queue_win.h",
|
||||||
@ -576,7 +579,7 @@ if (is_win) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
rtc_source_set("rtc_task_queue_stdlib") {
|
rtc_source_set("rtc_task_queue_stdlib") {
|
||||||
visibility = [ "../api/task_queue:default_task_queue_factory_impl" ]
|
visibility = [ "../api/task_queue:default_task_queue_factory" ]
|
||||||
sources = [
|
sources = [
|
||||||
"task_queue_stdlib.cc",
|
"task_queue_stdlib.cc",
|
||||||
"task_queue_stdlib.h",
|
"task_queue_stdlib.h",
|
||||||
@ -598,14 +601,6 @@ rtc_source_set("rtc_task_queue_stdlib") {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
rtc_source_set("rtc_task_queue_impl") {
|
|
||||||
visibility = [ "*" ]
|
|
||||||
deps = [
|
|
||||||
"../api/task_queue:default_task_queue_factory_impl",
|
|
||||||
"../api/task_queue:global_task_queue_factory",
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
rtc_source_set("sequenced_task_checker") {
|
rtc_source_set("sequenced_task_checker") {
|
||||||
sources = [
|
sources = [
|
||||||
"sequenced_task_checker.h",
|
"sequenced_task_checker.h",
|
||||||
|
@ -47,10 +47,6 @@ template("webrtc_fuzzer_test") {
|
|||||||
deps += [
|
deps += [
|
||||||
":fuzz_data_helper",
|
":fuzz_data_helper",
|
||||||
":webrtc_fuzzer_main",
|
":webrtc_fuzzer_main",
|
||||||
|
|
||||||
# Link unconditionally with webrtc's TaskQueue, regardless of
|
|
||||||
# rtc_link_task_queue_impl flag.
|
|
||||||
"../../rtc_base:rtc_task_queue_impl",
|
|
||||||
]
|
]
|
||||||
if (!build_with_chromium && is_clang) {
|
if (!build_with_chromium && is_clang) {
|
||||||
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
||||||
|
Reference in New Issue
Block a user