From effdfe2014b7022b91350dd5ba0e4fe26034853e Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Sat, 9 Mar 2019 22:01:27 +0100 Subject: [PATCH] Move dependency on chromium DefaultTaskQueueFactory That will avoid linkage error of targets that depend on global_task_queue_factory without depending on rtc_task_queue Bug: webrtc:10191 Change-Id: Ia67ea0a3abb715e28160e4e376133cc0309b14e2 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126621 Reviewed-by: Mirko Bonadei Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#27053} --- api/task_queue/BUILD.gn | 1 + rtc_base/BUILD.gn | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/api/task_queue/BUILD.gn b/api/task_queue/BUILD.gn index 0129512ae8..b57069b1c0 100644 --- a/api/task_queue/BUILD.gn +++ b/api/task_queue/BUILD.gn @@ -104,6 +104,7 @@ rtc_source_set("global_task_queue_factory") { if (build_with_chromium) { # Chromium uses link-time injection of the CreateDefaultTaskQueueFactory + deps += [ "../../../webrtc_overrides:task_queue_impl" ] sources += [ "default_task_queue_factory.h" ] } else { deps += [ ":default_task_queue_factory" ] diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 6fbbb3fe15..84a39ef32c 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -481,12 +481,6 @@ rtc_source_set("rtc_task_queue") { "task_utils:to_queued_task", "//third_party/abseil-cpp/absl/memory", ] - - # TODO(danilchap): Move this conditional dependency to global_task_queue_factory - # after removing task_queue_impl -> global_task_queue_factory dependency in chromium. - if (build_with_chromium) { - deps += [ "../../webrtc_overrides:task_queue_impl" ] - } } rtc_source_set("rtc_task_queue_api") {