commit effdfe2014b7022b91350dd5ba0e4fe26034853e
author Danil Chapovalov <danilchap@webrtc.org> Sat Mar 09 22:01:27 2019 +0100
committer Commit Bot <commit-bot@chromium.org> Mon Mar 11 11:28:28 2019 +0000
tree 01ca90e9fa234b52a66f17ea20826490a3a3edb9
parent d4a37a6ee6676e706e90f5217bebdbea6d63eed6

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 <mbonadei@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27053}

api/task_queue/BUILD.gn

diff --git a/api/task_queue/BUILD.gn b/api/task_queue/BUILD.gn
index 0129512..b57069b 100644
--- a/api/task_queue/BUILD.gn
+++ b/api/task_queue/BUILD.gn
@@ -104,6 +104,7 @@
 
   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" ]

rtc_base/BUILD.gn

diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 6fbbb3f..84a39ef 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -481,12 +481,6 @@
     "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") {