commit 56973e627ee12c42b8dcb1fa506103626f9b24d4
author Danil Chapovalov <danilchap@webrtc.org> Fri Feb 22 21:31:05 2019 +0100
committer Commit Bot <commit-bot@chromium.org> Sat Feb 23 13:03:15 2019 +0000
tree 97666f379212cb07741d9c3bdc725275eb9f88d9
parent 8721bb30d86d400a81c9b994e0e1a34a45e7e77b

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}

api/task_queue/BUILD.gn

diff --git a/api/task_queue/BUILD.gn b/api/task_queue/BUILD.gn
index 578a212..9b1a5ac 100644
--- a/api/task_queue/BUILD.gn
+++ b/api/task_queue/BUILD.gn
@@ -60,9 +60,7 @@
 }
 
 rtc_source_set("default_task_queue_factory") {
-  # TODO(bugs.webrtc.org/10191): Make public when implemented for all
-  # supported platforms.
-  visibility = [ ":global_task_queue_factory" ]
+  visibility = [ "*" ]
   sources = [
     "default_task_queue_factory.h",
   ]
@@ -73,42 +71,19 @@
   # TODO(bugs.webrtc.org/10284): Include implementation unconditionally when
   # global task queue factory is removed.
   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) {
-    sources = [
-      "default_task_queue_factory_libevent.cc",
-    ]
-    deps += [ "../../rtc_base:rtc_task_queue_libevent" ]
-  } else if (is_mac || is_ios) {
-    sources = [
-      "default_task_queue_factory_gcd.cc",
-    ]
-    deps += [ "../../rtc_base:rtc_task_queue_gcd" ]
-  } else if (is_win && current_os != "winuwp") {
-    sources = [
-      "default_task_queue_factory_win.cc",
-    ]
-    deps += [ "../../rtc_base:rtc_task_queue_win" ]
-  } else {
-    sources = [
-      "default_task_queue_factory_stdlib.cc",
-    ]
-    deps += [ "../../rtc_base:rtc_task_queue_stdlib" ]
+    if (rtc_enable_libevent) {
+      sources += [ "default_task_queue_factory_libevent.cc" ]
+      deps += [ "../../rtc_base:rtc_task_queue_libevent" ]
+    } else if (is_mac || is_ios) {
+      sources += [ "default_task_queue_factory_gcd.cc" ]
+      deps += [ "../../rtc_base:rtc_task_queue_gcd" ]
+    } else if (is_win && current_os != "winuwp") {
+      sources += [ "default_task_queue_factory_win.cc" ]
+      deps += [ "../../rtc_base:rtc_task_queue_win" ]
+    } else {
+      sources += [ "default_task_queue_factory_stdlib.cc" ]
+      deps += [ "../../rtc_base:rtc_task_queue_stdlib" ]
+    }
   }
 }
 

rtc_base/BUILD.gn

diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 63b4f3f..64282e2 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -474,7 +474,10 @@
   ]
 
   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 @@
 
 if (rtc_enable_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 = [
       "task_queue_libevent.cc",
       "task_queue_libevent.h",
@@ -534,7 +537,7 @@
 
 if (is_mac || is_ios) {
   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 = [
       "task_queue_gcd.cc",
       "task_queue_gcd.h",
@@ -552,7 +555,7 @@
 
 if (is_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 = [
       "task_queue_win.cc",
       "task_queue_win.h",
@@ -576,7 +579,7 @@
 }
 
 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 = [
     "task_queue_stdlib.cc",
     "task_queue_stdlib.h",
@@ -598,14 +601,6 @@
   ]
 }
 
-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") {
   sources = [
     "sequenced_task_checker.h",

test/fuzzers/BUILD.gn

diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index 6e723e1..88dec97 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -47,10 +47,6 @@
     deps += [
       ":fuzz_data_helper",
       ":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) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).