Thanks to visit codestin.com
Credit goes to webrtc.googlesource.com

Remove all usage of //rtc_base target

Bug: webrtc:9838
Change-Id: If813dbb426b4dc848185b64c0349d03fa9c059f2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/290986
Reviewed-by: Mirko Bonadei <[email protected]>
Auto-Submit: Florent Castelli <[email protected]>
Commit-Queue: Florent Castelli <[email protected]>
Commit-Queue: Mirko Bonadei <[email protected]>
Cr-Commit-Position: refs/heads/main@{#39116}
diff --git a/BUILD.gn b/BUILD.gn
index 6d6f793..01550a0 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -499,7 +499,6 @@
       "p2p:rtc_p2p",
       "pc:libjingle_peerconnection",
       "pc:rtc_pc",
-      "rtc_base",
       "sdk",
       "video",
     ]
diff --git a/api/BUILD.gn b/api/BUILD.gn
index fe91a6c..33a6b0a 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -54,7 +54,6 @@
       "../modules/audio_processing:api",
       "../pc:peer_connection_factory",
       "../pc:webrtc_sdp",
-      "../rtc_base",
       "../rtc_base:threading",
       "../stats:rtc_stats",
       "audio:audio_mixer_api",
@@ -143,7 +142,6 @@
     "candidate.h",
   ]
   deps = [
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:ip_address",
     "../rtc_base:logging",
@@ -187,7 +185,6 @@
     ":ice_transport_interface",
     ":rtc_error",
     ":scoped_refptr",
-    "../rtc_base",
     "../rtc_base:refcount",
     "../rtc_base:ssl",
     "../rtc_base/system:rtc_export",
@@ -331,7 +328,6 @@
     "../media:rtc_media_base",
     "../media:rtc_media_config",
     "../modules/audio_processing:audio_processing_statistics",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:ip_address",
     "../rtc_base:socket_address",
@@ -387,7 +383,6 @@
     "../rtc_base:async_packet_socket",
     "../rtc_base:async_resolver_interface",
     "../rtc_base:proxy_info",
-    "../rtc_base:rtc_base",
     "../rtc_base:socket_address",
     "../rtc_base/system:rtc_export",
   ]
@@ -549,7 +544,6 @@
   sources = [ "test/peer_network_dependencies.h" ]
   deps = [
     ":packet_socket_factory",
-    "../rtc_base",
     "../rtc_base:network",
     "../rtc_base:threading",
   ]
@@ -582,7 +576,6 @@
     "../modules/audio_processing:api",
     "../rtc_base:checks",
     "../rtc_base:network",
-    "../rtc_base:rtc_base",
     "../rtc_base:rtc_certificate_generator",
     "../rtc_base:ssl",
     "../rtc_base:stringutils",
@@ -808,7 +801,6 @@
   visibility = [ "*" ]
   sources = [ "test/simulated_network.h" ]
   deps = [
-    "../rtc_base",
     "../rtc_base:macromagic",
     "../rtc_base:random",
   ]
@@ -829,7 +821,6 @@
     ":simulated_network_api",
     ":time_controller",
     "../call:simulated_network",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:network",
     "../rtc_base:network_constants",
@@ -849,7 +840,6 @@
   ]
 
   deps = [
-    "../rtc_base",
     "../rtc_base:threading",
     "../rtc_base/synchronization:yield_policy",
     "../system_wrappers",
@@ -908,7 +898,6 @@
     ":packet_socket_factory",
     ":scoped_refptr",
     "../p2p:rtc_p2p",
-    "../rtc_base",
     "../rtc_base:threading",
     "../rtc_base/system:rtc_export",
     "rtc_event_log:rtc_event_log",
diff --git a/api/crypto/BUILD.gn b/api/crypto/BUILD.gn
index 9b6dea5..8d041ea 100644
--- a/api/crypto/BUILD.gn
+++ b/api/crypto/BUILD.gn
@@ -23,7 +23,6 @@
     "crypto_options.h",
   ]
   deps = [
-    "../../rtc_base:rtc_base",
     "../../rtc_base:ssl",
     "../../rtc_base/system:rtc_export",
   ]
diff --git a/api/test/network_emulation/BUILD.gn b/api/test/network_emulation/BUILD.gn
index 90b1136..d009d39 100644
--- a/api/test/network_emulation/BUILD.gn
+++ b/api/test/network_emulation/BUILD.gn
@@ -19,7 +19,6 @@
 
   deps = [
     "../..:array_view",
-    "../../../rtc_base",
     "../../../rtc_base:checks",
     "../../../rtc_base:copy_on_write_buffer",
     "../../../rtc_base:ip_address",
diff --git a/api/test/pclf/BUILD.gn b/api/test/pclf/BUILD.gn
index 8aeec2c..0526478 100644
--- a/api/test/pclf/BUILD.gn
+++ b/api/test/pclf/BUILD.gn
@@ -36,7 +36,6 @@
     "../../../modules/audio_processing:api",
     "../../../rtc_base:checks",
     "../../../rtc_base:network",
-    "../../../rtc_base:rtc_base",
     "../../../rtc_base:rtc_certificate_generator",
     "../../../rtc_base:ssl",
     "../../../rtc_base:stringutils",
@@ -78,7 +77,6 @@
     "../../../api/video_codecs:video_codecs_api",
     "../../../modules/audio_processing:api",
     "../../../p2p:rtc_p2p",
-    "../../../rtc_base",
     "../../../rtc_base:network",
     "../../../rtc_base:rtc_certificate_generator",
     "../../../rtc_base:ssl",
@@ -107,7 +105,6 @@
     "../../../api/transport:network_control",
     "../../../api/video_codecs:video_codecs_api",
     "../../../modules/audio_processing:api",
-    "../../../rtc_base",
     "../../../rtc_base:network",
     "../../../rtc_base:rtc_certificate_generator",
     "../../../rtc_base:ssl",
diff --git a/api/transport/BUILD.gn b/api/transport/BUILD.gn
index f6f0a6a..08f3d6d 100644
--- a/api/transport/BUILD.gn
+++ b/api/transport/BUILD.gn
@@ -104,7 +104,6 @@
     "../../rtc_base:crc32",
     "../../rtc_base:ip_address",
     "../../rtc_base:logging",
-    "../../rtc_base:rtc_base",
     "../../rtc_base:socket_address",
     "../../rtc_base:ssl",
     "../../system_wrappers:metrics",
@@ -143,7 +142,6 @@
     sources = [ "stun_unittest.cc" ]
     deps = [
       ":stun_types",
-      "../../rtc_base",
       "../../rtc_base:byte_buffer",
       "../../rtc_base:byte_order",
       "../../rtc_base:macromagic",
diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn
index 8df3018..fe824f2 100644
--- a/api/video/BUILD.gn
+++ b/api/video/BUILD.gn
@@ -98,7 +98,6 @@
     ":video_rtp_headers",
     "..:make_ref_counted",
     "..:scoped_refptr",
-    "../../rtc_base",
     "../../rtc_base:checks",
     "../../rtc_base:refcount",
     "../../rtc_base/memory:aligned_malloc",
diff --git a/call/BUILD.gn b/call/BUILD.gn
index 95483c2..fd4b111 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -68,7 +68,6 @@
     "../modules/audio_processing:api",
     "../modules/audio_processing:audio_processing_statistics",
     "../modules/rtp_rtcp:rtp_rtcp_format",
-    "../rtc_base",
     "../rtc_base:audio_format_to_string",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
@@ -212,7 +211,6 @@
     "../modules/video_coding:codec_globals_headers",
     "../modules/video_coding:frame_dependencies_calculator",
     "../modules/video_coding:video_codec_interface",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:event_tracer",
     "../rtc_base:logging",
@@ -584,7 +582,6 @@
         "../modules/audio_mixer:audio_mixer_impl",
         "../modules/rtp_rtcp",
         "../modules/rtp_rtcp:rtp_rtcp_format",
-        "../rtc_base",
         "../rtc_base:checks",
         "../rtc_base:logging",
         "../rtc_base:macromagic",
@@ -634,7 +631,6 @@
       "../api/crypto:options",
       "../api/transport:bitrate_settings",
       "../modules/pacing",
-      "../rtc_base",
       "../rtc_base:network_route",
       "../rtc_base:rate_limiter",
       "../rtc_base/network:sent_packet",
diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn
index 2aa969f..2ee08cc 100644
--- a/common_video/BUILD.gn
+++ b/common_video/BUILD.gn
@@ -53,7 +53,6 @@
     "../api/video:video_rtp_headers",
     "../api/video_codecs:bitstream_parser_api",
     "../api/video_codecs:video_codecs_api",
-    "../rtc_base",
     "../rtc_base:bit_buffer",
     "../rtc_base:bitstream_reader",
     "../rtc_base:buffer",
@@ -119,7 +118,6 @@
       "../api/video:video_frame_i010",
       "../api/video:video_rtp_headers",
       "../api/video_codecs:video_codecs_api",
-      "../rtc_base",
       "../rtc_base:bit_buffer",
       "../rtc_base:buffer",
       "../rtc_base:checks",
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index da0d02f..18cb6ec 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -71,7 +71,6 @@
   ]
   deps = [
     "../api:array_view",
-    "../rtc_base",
     "../rtc_base:stringutils",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/strings:strings" ]
@@ -498,7 +497,6 @@
         "../modules/audio_processing",
         "../modules/audio_processing:api",
         "../pc:libjingle_peerconnection",
-        "../rtc_base",
         "../rtc_base/synchronization:mutex",
         "../sdk:base_objc",
         "../sdk:default_codec_factory_objc",
@@ -636,7 +634,6 @@
         deps = [
           ":AppRTCMobile_lib",
           ":apprtc_signaling",
-          "../rtc_base",
           "../rtc_base:ssl",
           "../sdk:mediaconstraints_objc",
           "../sdk:peerconnectionfactory_base_objc",
@@ -765,7 +762,6 @@
       "../modules/audio_processing:api",
       "../modules/video_capture:video_capture_module",
       "../pc:libjingle_peerconnection",
-      "../rtc_base",
       "../rtc_base:rtc_json",
       "../test:video_test_common",
       "//third_party/abseil-cpp/absl/flags:flag",
@@ -803,7 +799,6 @@
       "../p2p:p2p_server_utils",
       "../p2p:rtc_p2p",
       "../pc:rtc_pc",
-      "../rtc_base",
       "../rtc_base:async_udp_socket",
       "../rtc_base:ip_address",
       "../rtc_base:socket_address",
@@ -819,7 +814,6 @@
       "../p2p:p2p_server_utils",
       "../p2p:rtc_p2p",
       "../pc:rtc_pc",
-      "../rtc_base",
       "../rtc_base:async_udp_socket",
       "../rtc_base:socket_address",
       "../rtc_base:socket_server",
@@ -870,7 +864,6 @@
       "../modules/video_capture:video_capture_module",
       "../pc:libjingle_peerconnection",
       "../pc:video_track_source",
-      "../rtc_base",
       "../rtc_base:ssl",
       "../test:platform_video_capturer",
       "../test:video_test_common",
@@ -945,7 +938,6 @@
     deps = [
       "../p2p:libstunprober",
       "../p2p:rtc_p2p",
-      "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:logging",
       "../rtc_base:network",
diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn
index 0a91700..e4c48a2 100644
--- a/examples/androidnativeapi/BUILD.gn
+++ b/examples/androidnativeapi/BUILD.gn
@@ -59,7 +59,6 @@
       "//media:rtc_media_engine_defaults",
       "//modules/utility",
       "//pc:libjingle_peerconnection",
-      "//rtc_base",
       "//sdk/android:native_api_base",
       "//sdk/android:native_api_jni",
       "//sdk/android:native_api_video",
diff --git a/examples/androidvoip/BUILD.gn b/examples/androidvoip/BUILD.gn
index f6c85a6..3d5186f 100644
--- a/examples/androidvoip/BUILD.gn
+++ b/examples/androidvoip/BUILD.gn
@@ -71,7 +71,6 @@
       "//api/task_queue:default_task_queue_factory",
       "//api/voip:voip_api",
       "//api/voip:voip_engine_factory",
-      "//rtc_base",
       "//rtc_base/third_party/sigslot:sigslot",
       "//sdk/android:native_api_audio_device_module",
       "//sdk/android:native_api_base",
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index 8a7f191..408d4ec 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -402,7 +402,6 @@
 
   deps = [
     "../api/rtc_event_log",
-    "../rtc_base",
     "../rtc_base:macromagic",
     "../rtc_base/synchronization:mutex",
   ]
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 4ab0b11..2e5c0bb 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -93,7 +93,6 @@
     "../modules/audio_device",
     "../modules/audio_processing:audio_processing_statistics",
     "../modules/rtp_rtcp:rtp_rtcp_format",
-    "../rtc_base",
     "../rtc_base:async_packet_socket",
     "../rtc_base:buffer",
     "../rtc_base:byte_order",
@@ -183,7 +182,6 @@
     "../api/video_codecs:video_codecs_api",
     "../common_video",
     "../modules/rtp_rtcp:rtp_rtcp_format",
-    "../rtc_base",
     "../rtc_base:async_packet_socket",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
@@ -231,7 +229,6 @@
     "../common_video",
     "../modules/audio_processing:audio_processing_statistics",
     "../modules/rtp_rtcp:rtp_rtcp_format",
-    "../rtc_base",
     "../rtc_base:async_packet_socket",
     "../rtc_base:buffer",
     "../rtc_base:copy_on_write_buffer",
@@ -282,7 +279,6 @@
     ":turn_utils",
     "../api:array_view",
     "../modules/rtp_rtcp:rtp_rtcp_format",
-    "../rtc_base",
     "../rtc_base:async_packet_socket",
     "../rtc_base:byte_order",
     "../rtc_base:checks",
@@ -300,7 +296,6 @@
   deps = [
     ":rid_description",
     "../api:array_view",
-    "../rtc_base",
     "../rtc_base:stringutils",
     "../rtc_base:unique_id_generator",
   ]
@@ -511,7 +506,6 @@
     "../modules/video_coding:video_coding_utility",
     "../modules/video_coding:webrtc_vp9_helpers",
     "../modules/video_coding/svc:scalability_mode_util",
-    "../rtc_base",
     "../rtc_base:audio_format_to_string",
     "../rtc_base:buffer",
     "../rtc_base:byte_order",
@@ -726,7 +720,6 @@
       "../modules/video_coding:video_coding_utility",
       "../modules/video_coding/svc:scalability_mode_util",
       "../p2p:rtc_p2p",
-      "../rtc_base",
       "../rtc_base:buffer",
       "../rtc_base:byte_order",
       "../rtc_base:checks",
@@ -853,7 +846,6 @@
         "../modules/video_coding:webrtc_vp8",
         "../modules/video_coding/svc:scalability_mode_util",
         "../p2p:p2p_test_utils",
-        "../rtc_base",
         "../rtc_base:async_packet_socket",
         "../rtc_base:byte_order",
         "../rtc_base:checks",
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index 0bf6968..dddc3ed 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -838,7 +838,6 @@
     "../../api:array_view",
     "../../api:rtp_headers",
     "../../common_audio",
-    "../../rtc_base",
     "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:ssl",
@@ -978,7 +977,6 @@
     "../../api/audio_codecs:builtin_audio_decoder_factory",
     "../../api/audio_codecs:builtin_audio_encoder_factory",
     "../../api/neteq:neteq_api",
-    "../../rtc_base",
     "../../rtc_base:checks",
     "../../rtc_base:ignore_wundef",
     "../../rtc_base:ssl",
@@ -1740,7 +1738,6 @@
         "../../logging:mocks",
         "../../logging:rtc_event_audio",
         "../../modules/rtp_rtcp:rtp_rtcp_format",
-        "../../rtc_base",
         "../../rtc_base:checks",
         "../../rtc_base:ignore_wundef",
         "../../rtc_base:macromagic",
diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index 3e6b201..64e83a0 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -393,7 +393,6 @@
         "../../api/audio:echo_detector_creator",
         "../../common_audio",
         "../../common_audio:common_audio_c",
-        "../../rtc_base",
         "../../rtc_base:checks",
         "../../rtc_base:gtest_prod",
         "../../rtc_base:ignore_wundef",
diff --git a/modules/congestion_controller/BUILD.gn b/modules/congestion_controller/BUILD.gn
index 13b0d53..33f5508 100644
--- a/modules/congestion_controller/BUILD.gn
+++ b/modules/congestion_controller/BUILD.gn
@@ -38,10 +38,6 @@
     "../remote_bitrate_estimator",
     "../rtp_rtcp:rtp_rtcp_format",
   ]
-
-  if (!build_with_mozilla) {
-    deps += [ "../../rtc_base" ]
-  }
 }
 
 if (rtc_include_tests && !build_with_chromium) {
diff --git a/modules/congestion_controller/rtp/BUILD.gn b/modules/congestion_controller/rtp/BUILD.gn
index 596d1f1..cd13332 100644
--- a/modules/congestion_controller/rtp/BUILD.gn
+++ b/modules/congestion_controller/rtp/BUILD.gn
@@ -38,10 +38,6 @@
     "../../pacing",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
-
-  if (!build_with_mozilla) {
-    deps += [ "../../../rtc_base" ]
-  }
 }
 rtc_library("transport_feedback") {
   visibility = [ "*" ]
@@ -58,7 +54,6 @@
     "../../../api/transport:network_control",
     "../../../api/units:data_size",
     "../../../api/units:timestamp",
-    "../../../rtc_base",
     "../../../rtc_base:checks",
     "../../../rtc_base:logging",
     "../../../rtc_base:macromagic",
@@ -90,7 +85,6 @@
       "../:congestion_controller",
       "../../../api/transport:network_control",
       "../../../logging:mocks",
-      "../../../rtc_base",
       "../../../rtc_base:checks",
       "../../../rtc_base:safe_conversions",
       "../../../rtc_base/network:sent_packet",
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
index 76b95b7..c9993dd 100644
--- a/modules/desktop_capture/BUILD.gn
+++ b/modules/desktop_capture/BUILD.gn
@@ -41,11 +41,6 @@
     "../../rtc_base/system:rtc_export",
     "//third_party/libyuv",
   ]
-
-  if (!build_with_mozilla) {
-    deps += [ "../../rtc_base" ]  # TODO(kjellander): Cleanup in
-                                  # bugs.webrtc.org/3806.
-  }
 }
 
 if (rtc_include_tests) {
@@ -69,7 +64,6 @@
         ":desktop_capture_mock",
         ":primitives",
         ":screen_drawer",
-        "../../rtc_base",
         "../../rtc_base/third_party/base64",
         "../../system_wrappers",
         "../../test:test_support",
@@ -117,7 +111,6 @@
 
         # TODO(bugs.webrtc.org/9987): Remove this dep on rtc_base:rtc_base once
         # rtc_base:threading is fully defined.
-        "../../rtc_base:rtc_base",
         "../../rtc_base:task_queue_for_test",
         "../../rtc_base:threading",
         "../../system_wrappers",
@@ -170,7 +163,6 @@
 
       # TODO(bugs.webrtc.org/9987): Remove this dep on rtc_base:rtc_base once
       # rtc_base:threading is fully defined.
-      "../../rtc_base:rtc_base",
       "../../rtc_base:task_queue_for_test",
       "../../rtc_base:threading",
       "../../system_wrappers",
@@ -653,7 +645,6 @@
       "../../api:refcountedbase",
       "../../api:scoped_refptr",
       "../../api:sequence_checker",
-      "../../rtc_base",
       "../../rtc_base:checks",
       "../../rtc_base:event_tracer",
       "../../rtc_base:logging",
diff --git a/modules/portal/BUILD.gn b/modules/portal/BUILD.gn
index 8c83749..d0756f2 100644
--- a/modules/portal/BUILD.gn
+++ b/modules/portal/BUILD.gn
@@ -47,7 +47,7 @@
         "../../:common_config",
         ":pipewire",
       ]
-      deps = [ "../../rtc_base" ]
+      deps = [ "../../rtc_base:logging" ]
       extra_header = "pipewire_stub_header.fragment"
       logging_function = "RTC_LOG(LS_VERBOSE)"
       logging_include = "rtc_base/logging.h"
diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index 9e2352f..463530b 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -130,7 +130,6 @@
       "../../api/units:data_size",
       "../../api/units:time_delta",
       "../../api/units:timestamp",
-      "../../rtc_base",
       "../../rtc_base:checks",
       "../../rtc_base:random",
       "../../system_wrappers",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index aa19b1a..fe63804 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -275,7 +275,6 @@
     "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
-    "../../rtc_base",
     "../../rtc_base:checks",
     "../../rtc_base:copy_on_write_buffer",
     "../../rtc_base:event_tracer",
@@ -528,7 +527,6 @@
     "../../media:codec",
     "../../media:media_constants",
     "../../media:rtc_media_base",
-    "../../rtc_base",
     "../../rtc_base:checks",
     "../../rtc_base:event_tracer",
     "../../rtc_base:logging",
@@ -580,7 +578,6 @@
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
     "../../media:rtc_media_base",
-    "../../rtc_base",
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base/synchronization:mutex",
@@ -759,7 +756,6 @@
     "../../common_video",
     "../../media:codec",
     "../../media:rtc_media_base",
-    "../../rtc_base",
     "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:event_tracer",
@@ -1114,7 +1110,6 @@
       "../../media:rtc_internal_video_codecs",
       "../../media:rtc_media_base",
       "../../media:rtc_simulcast_encoder_adapter",
-      "../../rtc_base",
       "../../rtc_base:refcount",
       "../../rtc_base:stringutils",
       "../../rtc_base:timeutils",
@@ -1279,7 +1274,6 @@
       "../../common_video/test:utilities",
       "../../media:media_constants",
       "../../media:rtc_media_base",
-      "../../rtc_base",
       "../../rtc_base:checks",
       "../../rtc_base:gunit_helpers",
       "../../rtc_base:histogram_percentile_counter",
diff --git a/modules/video_coding/timing/BUILD.gn b/modules/video_coding/timing/BUILD.gn
index 17dd42b..38348e6 100644
--- a/modules/video_coding/timing/BUILD.gn
+++ b/modules/video_coding/timing/BUILD.gn
@@ -59,7 +59,6 @@
     "../../../api/units:frequency",
     "../../../api/units:time_delta",
     "../../../api/units:timestamp",
-    "../../../rtc_base",
     "../../../rtc_base:checks",
     "../../../rtc_base:logging",
     "../../../rtc_base:rolling_accumulator",
diff --git a/net/dcsctp/rx/BUILD.gn b/net/dcsctp/rx/BUILD.gn
index 8ef60dc..d66fd6b 100644
--- a/net/dcsctp/rx/BUILD.gn
+++ b/net/dcsctp/rx/BUILD.gn
@@ -48,7 +48,6 @@
   deps = [
     ":reassembly_streams",
     "../../../api:array_view",
-    "../../../rtc_base",
     "../../../rtc_base:checks",
     "../../../rtc_base:logging",
     "../common:sequence_numbers",
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index 5431d6d..b152fc6 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -113,7 +113,6 @@
     "../api/units:time_delta",
     "../api/units:timestamp",
     "../logging:ice_log",
-    "../rtc_base",
     "../rtc_base:async_packet_socket",
     "../rtc_base:async_resolver_interface",
     "../rtc_base:async_tcp_socket",
@@ -240,7 +239,6 @@
       "../api:turn_customizer",
       "../api/crypto:options",
       "../api/transport:stun_types",
-      "../rtc_base",
       "../rtc_base:async_resolver_interface",
       "../rtc_base:async_udp_socket",
       "../rtc_base:copy_on_write_buffer",
@@ -302,7 +300,6 @@
       "../api/task_queue:pending_task_safety_flag",
       "../api/transport:stun_types",
       "../api/units:time_delta",
-      "../rtc_base",
       "../rtc_base:async_packet_socket",
       "../rtc_base:buffer",
       "../rtc_base:byte_buffer",
@@ -363,7 +360,6 @@
     "../api/task_queue:pending_task_safety_flag",
     "../api/transport:stun_types",
     "../api/units:time_delta",
-    "../rtc_base",
     "../rtc_base:async_packet_socket",
     "../rtc_base:async_udp_socket",
     "../rtc_base:byte_buffer",
@@ -397,7 +393,6 @@
     "../api/task_queue:pending_task_safety_flag",
     "../api/transport:stun_types",
     "../api/units:time_delta",
-    "../rtc_base",
     "../rtc_base:async_packet_socket",
     "../rtc_base:async_resolver_interface",
     "../rtc_base:byte_buffer",
@@ -422,7 +417,6 @@
       ":libstunprober",
       ":p2p_test_utils",
       ":rtc_p2p",
-      "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:ip_address",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 176f8c5..0be2fab 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -89,7 +89,6 @@
     "../media:stream_params",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../p2p:rtc_p2p",
-    "../rtc_base",
     "../rtc_base:async_packet_socket",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
@@ -136,7 +135,6 @@
     "../api:libjingle_peerconnection_api",
     "../api:rtc_error",
     "../p2p:rtc_p2p",
-    "../rtc_base",
     "../rtc_base:buffer",
     "../rtc_base:checks",
     "../rtc_base:logging",
@@ -161,7 +159,6 @@
     "../api:scoped_refptr",
     "../api:sequence_checker",
     "../p2p:rtc_p2p",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -230,7 +227,6 @@
     "../api/transport:datagram_transport_interface",
     "../media:rtc_data_sctp_transport_internal",
     "../p2p:rtc_p2p",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
     "../rtc_base:event_tracer",
@@ -301,7 +297,6 @@
     "../api/transport:sctp_transport_factory_interface",
     "../media:rtc_data_sctp_transport_internal",
     "../p2p:rtc_p2p",
-    "../rtc_base",
     "../rtc_base:callback_list",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
@@ -344,7 +339,6 @@
     "../media:rtc_sdp_video_format_utils",
     "../media:stream_params",
     "../p2p:rtc_p2p",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:ssl",
@@ -456,7 +450,6 @@
     "../media:rtp_utils",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../p2p:rtc_p2p",
-    "../rtc_base",
     "../rtc_base:async_packet_socket",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
@@ -482,7 +475,6 @@
     ":session_description",
     "../call:rtp_receiver",
     "../p2p:rtc_p2p",
-    "../rtc_base",
     "../rtc_base:network_route",
     "../rtc_base:ssl",
     "../rtc_base/third_party/sigslot",
@@ -504,7 +496,6 @@
     "../api/transport:datagram_transport_interface",
     "../media:rtc_data_sctp_transport_internal",
     "../p2p:rtc_p2p",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -546,7 +537,6 @@
     "../api:array_view",
     "../api:libjingle_peerconnection_api",
     "../api:sequence_checker",
-    "../rtc_base",
     "../rtc_base:buffer",
     "../rtc_base:logging",
     "../rtc_base:ssl",
@@ -572,7 +562,6 @@
     "../api:scoped_refptr",
     "../api:sequence_checker",
     "../modules/rtp_rtcp:rtp_rtcp_format",
-    "../rtc_base",
     "../rtc_base:byte_order",
     "../rtc_base:checks",
     "../rtc_base:logging",
@@ -607,7 +596,6 @@
     "../media:rtp_utils",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../p2p:rtc_p2p",
-    "../rtc_base",
     "../rtc_base:async_packet_socket",
     "../rtc_base:buffer",
     "../rtc_base:checks",
@@ -636,7 +624,6 @@
     "../api:dtls_transport_interface",
     "../api:libjingle_peerconnection_api",
     "../p2p:rtc_p2p",
-    "../rtc_base",
     "../rtc_base:ssl",
   ]
 }
@@ -841,7 +828,6 @@
     "../modules/audio_processing:audio_processing_statistics",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../p2p:rtc_p2p",
-    "../rtc_base",
     "../rtc_base:callback_list",
     "../rtc_base:checks",
     "../rtc_base:ip_address",
@@ -894,7 +880,6 @@
     "../rtc_base:copy_on_write_buffer",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
-    "../rtc_base:rtc_base",
     "../rtc_base:ssl",
     "../rtc_base:threading",
     "../rtc_base:threading",
@@ -942,7 +927,6 @@
     "../media:rtc_data_sctp_transport_factory",
     "../media:rtc_media_base",
     "../p2p:rtc_p2p",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:macromagic",
     "../rtc_base:network",
@@ -974,7 +958,6 @@
     "../api/transport:datagram_transport_interface",
     "../media:media_channel",
     "../media:rtc_media_base",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
     "../rtc_base:logging",
@@ -1073,7 +1056,6 @@
     "../rtc_base:logging",
     "../rtc_base:network_constants",
     "../rtc_base:refcount",
-    "../rtc_base:rtc_base",
     "../rtc_base:rtc_event",
     "../rtc_base:socket_address",
     "../rtc_base:ssl",
@@ -1159,7 +1141,6 @@
     "../media:rtc_media_base",
     "../media:stream_params",
     "../p2p:rtc_p2p",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:event_tracer",
     "../rtc_base:logging",
@@ -1264,7 +1245,6 @@
     "../media:stream_params",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../p2p:rtc_p2p",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
     "../rtc_base:event_tracer",
@@ -1364,7 +1344,6 @@
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:network_constants",
-    "../rtc_base:rtc_base",
     "../rtc_base:socket_address",
     "../rtc_base:ssl",
     "../rtc_base:stringutils",
@@ -1438,7 +1417,6 @@
     "../rtc_base:macromagic",
     "../rtc_base:net_helper",
     "../rtc_base:network_constants",
-    "../rtc_base:rtc_base",
     "../rtc_base:socket_address",
     "../rtc_base:ssl",
     "../rtc_base:stringutils",
@@ -1469,7 +1447,6 @@
     "../p2p:rtc_p2p",
     "../rtc_base:checks",
     "../rtc_base:logging",
-    "../rtc_base:rtc_base",
     "../rtc_base:rtc_certificate_generator",
     "../rtc_base:ssl",
     "../rtc_base:stringutils",
@@ -1565,7 +1542,6 @@
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
-    "../rtc_base:rtc_base",
     "../rtc_base:rtc_certificate_generator",
     "../rtc_base:safe_conversions",
     "../rtc_base:threading",
@@ -1686,7 +1662,6 @@
     "../api:sequence_checker",
     "../media:media_channel",
     "../media:rtc_media_base",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -1744,7 +1719,6 @@
     "../media:rtc_media_base",
     "../rtc_base:checks",
     "../rtc_base:logging",
-    "../rtc_base:rtc_base",
     "../rtc_base:threading",
   ]
   absl_deps = [
@@ -1779,7 +1753,6 @@
     "../api/transport/rtp:rtp_source",
     "../media:media_channel",
     "../media:rtc_media_base",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:macromagic",
     "../rtc_base:threading",
@@ -1818,7 +1791,6 @@
     "../api/video:video_frame",
     "../media:media_channel",
     "../media:rtc_media_base",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -1844,7 +1816,6 @@
     "../api/video:recordable_encoded_frame",
     "../api/video:video_frame",
     "../media:rtc_media_base",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:macromagic",
     "../rtc_base/synchronization:mutex",
@@ -1880,7 +1851,6 @@
     "../api:sequence_checker",
     "../api/video:video_frame",
     "../media:rtc_media_base",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:macromagic",
     "../rtc_base:threading",
@@ -1927,7 +1897,6 @@
     "../api/task_queue",
     "../media:media_channel",
     "../media:rtc_media_base",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:event_tracer",
     "../rtc_base:logging",
@@ -1970,7 +1939,6 @@
     "../rtc_base:event_tracer",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
-    "../rtc_base:rtc_base",
     "../rtc_base:ssl",
     "../rtc_base:threading",
     "../rtc_base/synchronization:mutex",
@@ -2002,7 +1970,6 @@
     "../media:stream_params",
     "../rtc_base:checks",
     "../rtc_base:logging",
-    "../rtc_base:rtc_base",
     "../rtc_base:stringutils",
   ]
   absl_deps = [
@@ -2051,7 +2018,6 @@
     "../api:media_stream_interface",
     "../api:scoped_refptr",
     "../rtc_base:checks",
-    "../rtc_base:rtc_base",
   ]
   absl_deps = [
     "//third_party/abseil-cpp/absl/algorithm:container",
@@ -2190,7 +2156,6 @@
       "../p2p:fake_port_allocator",
       "../p2p:p2p_test_utils",
       "../p2p:rtc_p2p",
-      "../rtc_base",
       "../rtc_base:async_packet_socket",
       "../rtc_base:buffer",
       "../rtc_base:byte_order",
@@ -2267,7 +2232,6 @@
       "../modules/audio_processing:api",
       "../p2p:p2p_test_utils",
       "../p2p:rtc_p2p",
-      "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:rtc_base_tests_utils",
@@ -2320,7 +2284,6 @@
       "../p2p:p2p_server_utils",
       "../p2p:p2p_test_utils",
       "../p2p:rtc_p2p",
-      "../rtc_base",
       "../rtc_base:gunit_helpers",
       "../rtc_base:logging",
       "../rtc_base:rtc_base_tests_utils",
@@ -2570,7 +2533,6 @@
       "../modules/audio_processing:api",
       "../p2p:p2p_test_utils",
       "../p2p:rtc_p2p",
-      "../rtc_base",
       "../rtc_base:rtc_task_queue",
       "../rtc_base:safe_conversions",
       "../test:audio_codec_mocks",
@@ -2606,7 +2568,6 @@
         "../sdk/android:libjingle_peerconnection_jni",
         "//modules/utility:utility",
         "//rtc_base:checks",
-        "//rtc_base:rtc_base",
         "//testing/android/native_test:native_test_support",
       ]
     }
@@ -2698,7 +2659,6 @@
       "../p2p:p2p_server_utils",
       "../p2p:p2p_test_utils",
       "../p2p:rtc_p2p",
-      "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:ip_address",
@@ -2811,7 +2771,6 @@
       "../p2p:fake_port_allocator",
       "../p2p:p2p_test_utils",
       "../p2p:rtc_p2p",
-      "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:logging",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index c6a3a4b..eb80442 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -1731,7 +1731,6 @@
   ]
   deps = [
     ":logging",
-    ":rtc_base",
     ":rtc_base_tests_utils",
     ":stringutils",
     ":threading",
@@ -1749,7 +1748,6 @@
   deps = [
     ":async_udp_socket",
     ":gunit_helpers",
-    ":rtc_base",
     ":rtc_base_tests_utils",
     ":threading",
     ":timeutils",
@@ -1764,7 +1762,6 @@
   deps = [
     ":callback_list",
     ":gunit_helpers",
-    ":rtc_base",
     "../api:function_view",
     "../test:test_support",
   ]
@@ -1821,7 +1818,6 @@
     ":macromagic",
     ":mdns_responder_interface",
     ":network",
-    ":rtc_base",
     ":rtc_event",
     ":socket",
     ":socket_adapters",
@@ -1882,7 +1878,6 @@
     sources = [ "sigslot_unittest.cc" ]
     deps = [
       ":gunit_helpers",
-      ":rtc_base",
       ":rtc_base_tests_utils",
       "../test:test_support",
       "synchronization:mutex",
@@ -1905,7 +1900,6 @@
     sources = [ "operations_chain_unittest.cc" ]
     deps = [
       ":gunit_helpers",
-      ":rtc_base",
       ":rtc_event",
       ":rtc_operations_chain",
       ":threading",
@@ -1939,7 +1933,6 @@
         ":net_helpers",
         ":null_socket_server",
         ":platform_thread",
-        ":rtc_base",
         ":rtc_base_tests_utils",
         ":socket",
         ":socket_address",
@@ -2037,7 +2030,6 @@
         ":rate_statistics",
         ":rate_tracker",
         ":refcount",
-        ":rtc_base",
         ":rtc_base_tests_utils",
         ":rtc_event",
         ":rtc_numerics",
@@ -2200,7 +2192,6 @@
         ":null_socket_server",
         ":refcount",
         ":rolling_accumulator",
-        ":rtc_base",
         ":rtc_base_tests_utils",
         ":rtc_certificate_generator",
         ":rtc_event",
diff --git a/rtc_base/memory/BUILD.gn b/rtc_base/memory/BUILD.gn
index 8224267..ee3baa4 100644
--- a/rtc_base/memory/BUILD.gn
+++ b/rtc_base/memory/BUILD.gn
@@ -33,7 +33,6 @@
     "fifo_buffer.h",
   ]
   deps = [
-    "..:rtc_base",
     "..:stream",
     "..:threading",
     "../../api/task_queue:pending_task_safety_flag",
diff --git a/rtc_base/synchronization/BUILD.gn b/rtc_base/synchronization/BUILD.gn
index 5f2b04e..858135f 100644
--- a/rtc_base/synchronization/BUILD.gn
+++ b/rtc_base/synchronization/BUILD.gn
@@ -88,7 +88,6 @@
         "..:checks",
         "..:macromagic",
         "..:platform_thread",
-        "..:rtc_base",
         "..:rtc_event",
         "..:threading",
         "../../test:test_support",
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 92576ca..0d97b85 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -211,7 +211,6 @@
       "../media:media_constants",
       "../media:rtc_audio_video",
       "../media:rtc_media_base",
-      "../rtc_base",
       "../rtc_base:rtc_json",
       "../rtc_base:threading",
       "../rtc_base/system:file_wrapper",
@@ -520,7 +519,6 @@
         "../api/video:video_frame",
         "../api/video:video_rtp_headers",
         "../common_video",
-        "../rtc_base",
         "../rtc_base:checks",
         "../rtc_base:null_socket_server",
         "../rtc_base:threading",
diff --git a/rtc_tools/data_channel_benchmark/BUILD.gn b/rtc_tools/data_channel_benchmark/BUILD.gn
index 6c8d987..040061b 100644
--- a/rtc_tools/data_channel_benchmark/BUILD.gn
+++ b/rtc_tools/data_channel_benchmark/BUILD.gn
@@ -50,7 +50,6 @@
     "../../api/audio_codecs:builtin_audio_encoder_factory",
     "../../api/video_codecs:builtin_video_decoder_factory",
     "../../api/video_codecs:builtin_video_encoder_factory",
-    "../../rtc_base",
     "../../rtc_base:logging",
     "../../rtc_base:refcount",
     "../../rtc_base:rtc_event",
diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
index cc934ad..e33a3c0 100644
--- a/rtc_tools/network_tester/BUILD.gn
+++ b/rtc_tools/network_tester/BUILD.gn
@@ -44,7 +44,6 @@
       "../../api/task_queue:default_task_queue_factory",
       "../../api/task_queue:pending_task_safety_flag",
       "../../p2p:rtc_p2p",
-      "../../rtc_base",
       "../../rtc_base:async_packet_socket",
       "../../rtc_base:checks",
       "../../rtc_base:ignore_wundef",
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 53f25a6..a361656 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -123,7 +123,6 @@
     ]
 
     deps = [
-      "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:logging",
     ]
@@ -157,6 +156,7 @@
     frameworks = [
       "AVFoundation.framework",
       "CoreMedia.framework",
+      "Foundation.framework",
     ]
 
     configs += [
@@ -173,6 +173,7 @@
         "objc/helpers/UIDevice+RTCDevice.h",
         "objc/helpers/UIDevice+RTCDevice.mm",
       ]
+      frameworks += [ "UIKit.framework" ]
     }
   }
 
@@ -186,7 +187,6 @@
       deps = [
         ":base_objc",
         ":helpers_objc",
-        "../rtc_base",
         "../rtc_base:checks",
         "../rtc_base:log_sinks",
         "../rtc_base:logging",
@@ -208,7 +208,6 @@
 
       deps = [
         ":base_objc",
-        "../rtc_base",
         "../rtc_base:checks",
         "../rtc_base:file_rotating_stream",
         "../rtc_base:log_sinks",
@@ -248,10 +247,7 @@
 
         sources = [ "objc/native/src/audio/audio_session_observer.h" ]
 
-        deps = [
-          "../rtc_base",
-          "../rtc_base:threading",
-        ]
+        deps = [ "../rtc_base:threading" ]
       }
 
       rtc_library("audio_device") {
@@ -281,7 +277,6 @@
           "../modules/audio_device:audio_device_api",
           "../modules/audio_device:audio_device_buffer",
           "../modules/audio_device:audio_device_generic",
-          "../rtc_base",
           "../rtc_base:buffer",
           "../rtc_base:checks",
           "../rtc_base:logging",
@@ -351,7 +346,6 @@
         deps = [
           ":base_objc",
           ":helpers_objc",
-          "../rtc_base",
           "../rtc_base:checks",
           "../rtc_base/synchronization:mutex",
         ]
@@ -365,7 +359,6 @@
         sources = [ "objc/native/src/network_monitor_observer.h" ]
 
         deps = [
-          "../rtc_base",
           "../rtc_base:network_constants",
           "../rtc_base:stringutils",
           "../rtc_base:threading",
@@ -475,7 +468,6 @@
         "../common_video",
         "../media:rtc_media_base",
         "../pc:video_track_source_proxy",
-        "../rtc_base",
         "../rtc_base:checks",
         "../rtc_base:threading",
         "//third_party/libyuv",
@@ -563,7 +555,6 @@
         "../api/video:video_rtp_headers",
         "../common_video",
         "../media:rtc_media_base",
-        "../rtc_base",
         "../rtc_base:checks",
         "../rtc_base:logging",
       ]
@@ -927,7 +918,6 @@
         "../api/video:encoded_image",
         "../api/video_codecs:video_codecs_api",
         "../modules/video_coding:video_codec_interface",
-        "../rtc_base",
         "../rtc_base:refcount",
         "../rtc_base:safe_conversions",
       ]
@@ -1096,7 +1086,6 @@
         "../modules/video_coding:video_codec_interface",
         "../pc:peer_connection_factory",
         "../pc:webrtc_sdp",
-        "../rtc_base",
         "../rtc_base:checks",
         "../rtc_base:event_tracer",
         "../rtc_base:logging",
@@ -1199,7 +1188,6 @@
             "../modules/audio_device:audio_device_api",
             "../modules/audio_processing:api",
             "../modules/video_coding:video_codec_interface",
-            "../rtc_base",
             "../rtc_base:gunit_helpers",
             "../rtc_base:macromagic",
             "../rtc_base:refcount",
@@ -1242,7 +1230,6 @@
             ":peerconnectionfactory_base_objc",
             ":sdk_unittests_bundle_data",
             ":sdk_unittests_sources",
-            "../rtc_base",
             "../rtc_base:threading",
             "//test:test_support",
           ]
@@ -1262,7 +1249,6 @@
           deps = [
             ":framework_objc+link",
             ":ios_framework_bundle",
-            "../rtc_base",
             "../rtc_base:threading",
             "//test:test_support",
           ]
@@ -1406,6 +1392,8 @@
           "AVFoundation.framework",
           "CoreGraphics.framework",
           "CoreMedia.framework",
+          "Foundation.framework",
+          "UIKit.framework",
         ]
 
         configs = [
@@ -1612,7 +1600,6 @@
         "../api/video:video_rtp_headers",
         "../api/video_codecs:video_codecs_api",
         "../common_video",
-        "../rtc_base",
         "../rtc_base:buffer",
         "../rtc_base:logging",
         "../rtc_base:ssl",
@@ -1639,7 +1626,6 @@
           "../api:field_trials_view",
           "../api:sequence_checker",
           "../api/task_queue:pending_task_safety_flag",
-          "../rtc_base",
           "../rtc_base:logging",
           "../rtc_base:macromagic",
           "../rtc_base:stringutils",
@@ -1687,7 +1673,6 @@
         "../media:rtc_audio_video",
         "../media:rtc_media_base",
         "../modules/video_coding:video_codec_interface",
-        "../rtc_base",
         "../rtc_base:checks",
         "../rtc_base:logging",
         "../rtc_base:timestamp_aligner",
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index f80dc50..b3abdc7 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -140,7 +140,6 @@
       ":native_api_jni",
       ":video_egl_jni",
       "../../pc:libjingle_peerconnection",
-      "../../rtc_base",
       "../../rtc_base:ssl",
     ]
     output_extension = "so"
@@ -571,7 +570,6 @@
       "../../api:sequence_checker",
       "../../api/task_queue:pending_task_safety_flag",
       "../../modules/audio_processing:api",
-      "../../rtc_base",
       "../../rtc_base:checks",
       "../../rtc_base:ip_address",
       "../../rtc_base:logging",
@@ -674,7 +672,6 @@
       "../../modules/video_coding:video_codec_interface",
       "../../modules/video_coding:video_coding_utility",
       "../../modules/video_coding/svc:scalable_video_controller",
-      "../../rtc_base",
       "../../rtc_base:checks",
       "../../rtc_base:logging",
       "../../rtc_base:race_checker",
@@ -785,7 +782,6 @@
       "../../modules/utility",
       "../../pc:media_stream_observer",
       "../../pc:webrtc_sdp",
-      "../../rtc_base",
       "../../rtc_base:checks",
       "../../rtc_base:event_tracer",
       "../../rtc_base:log_sinks",
@@ -955,7 +951,6 @@
     deps = [
       ":base_jni",
       ":native_api_jni",
-      "//rtc_base",
       "//rtc_base:checks",
     ]
   }
@@ -1016,7 +1011,6 @@
     deps = [
       ":base_jni",
       "../../rtc_base:threading",
-      "//rtc_base",
     ]
   }
 
@@ -1033,7 +1027,6 @@
       "../../rtc_base:threading",
       "//api:libjingle_peerconnection_api",
       "//api/video_codecs:video_codecs_api",
-      "//rtc_base",
     ]
   }
 
@@ -1075,7 +1068,6 @@
       "//api:media_stream_interface",
       "//api/video:video_frame",
       "//api/video:video_rtp_headers",
-      "//rtc_base",
     ]
   }
 
@@ -1120,7 +1112,6 @@
       "../../api/video:video_frame",
       "../../api/video:video_rtp_headers",
       "../../common_video",
-      "../../rtc_base",
       "../../rtc_base:checks",
       "../../rtc_base:refcount",
       "../../rtc_base:timeutils",
@@ -1138,7 +1129,6 @@
       ":base_jni",
       ":generated_logging_jni",
       ":native_api_jni",
-      "../../rtc_base",
       "../../rtc_base:logging",
     ]
 
@@ -1561,7 +1551,6 @@
       ":libjingle_peerconnection_metrics_default_jni",
       ":native_api_jni",
       "../../pc:libjingle_peerconnection",
-      "../../rtc_base",
       "../../rtc_base:ssl",
     ]
     output_extension = "so"
@@ -1653,7 +1642,6 @@
       "../../rtc_base:logging",
       "../../rtc_base:macromagic",
       "../../rtc_base:platform_thread",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_event",
       "../../rtc_base:stringutils",
       "../../rtc_base:threading",
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 99f21aa..86ab7cc 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -66,7 +66,6 @@
     "../modules/video_coding:webrtc_h264",
     "../modules/video_coding:webrtc_vp8",
     "../modules/video_coding:webrtc_vp9",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:criticalsection",
     "../rtc_base:logging",
@@ -127,7 +126,6 @@
     "../api/video_codecs:video_codecs_api",
     "../common_video",
     "../media:rtc_media_base",
-    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:criticalsection",
     "../rtc_base:logging",
@@ -172,7 +170,6 @@
         "../api:media_stream_interface",
         "../api:scoped_refptr",
         "../modules/video_capture:video_capture_module",
-        "../rtc_base",
         "../rtc_base:threading",
         "../sdk:base_objc",
         "../sdk:native_api",
@@ -527,7 +524,6 @@
       "../api/test/metrics:metrics_set_proto_file_exporter",
       "../api/test/metrics:print_result_proxy_metrics_exporter",
       "../api/test/metrics:stdout_metrics_exporter",
-      "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:event_tracer",
       "../rtc_base:logging",
@@ -1026,7 +1022,6 @@
     "../modules/video_coding:codec_globals_headers",
     "../rtc_base:checks",
     "../rtc_base:criticalsection",
-    "../rtc_base:rtc_base",
     "../rtc_base:rtc_event",
     "../rtc_base:task_queue_for_test",
     "../rtc_base:threading",
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index daf8e2b..c357671 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -429,7 +429,6 @@
   sources = [ "pseudotcp_parser_fuzzer.cc" ]
   deps = [
     "../../p2p:rtc_p2p",
-    "../../rtc_base",
     "../../rtc_base:threading",
   ]
 }
@@ -647,7 +646,6 @@
   sources = [ "ssl_certificate_fuzzer.cc" ]
   deps = [
     "../:rtp_test_utils",
-    "../../rtc_base",
     "../../rtc_base:ssl",
     "../../rtc_base:stringutils",
   ]
diff --git a/test/network/BUILD.gn b/test/network/BUILD.gn
index 79e91e2..20b17bc 100644
--- a/test/network/BUILD.gn
+++ b/test/network/BUILD.gn
@@ -57,7 +57,6 @@
     "../../call:simulated_network",
     "../../p2p:p2p_server_utils",
     "../../p2p:rtc_p2p",
-    "../../rtc_base",
     "../../rtc_base:async_packet_socket",
     "../../rtc_base:copy_on_write_buffer",
     "../../rtc_base:ip_address",
@@ -131,7 +130,6 @@
       "../../p2p:rtc_p2p",
       "../../pc:pc_test_utils",
       "../../pc:peerconnection_wrapper",
-      "../../rtc_base",
       "../../rtc_base:gunit_helpers",
       "../../rtc_base:logging",
       "../../rtc_base:rtc_event",
@@ -149,7 +147,6 @@
     "../../api:network_emulation_manager_api",
     "../../api:simulated_network_api",
     "../../call:simulated_network",
-    "../../rtc_base",
     "../../rtc_base:logging",
     "../../rtc_base:network_constants",
     "../../rtc_base:rtc_event",
diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index f032124..7354aa8 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -230,7 +230,6 @@
         "../../../api/units:timestamp",
         "../../../pc:pc_test_utils",
         "../../../pc:sdp_utils",
-        "../../../rtc_base",
         "../../../rtc_base:gunit_helpers",
         "../../../rtc_base:macromagic",
         "../../../rtc_base:safe_conversions",
@@ -293,7 +292,6 @@
         "../../../p2p:rtc_p2p",
         "../../../pc:pc_test_utils",
         "../../../pc:peerconnection_wrapper",
-        "../../../rtc_base",
         "../../../rtc_base:gunit_helpers",
         "../../../rtc_base:logging",
         "../../../rtc_base:rtc_event",
@@ -505,7 +503,6 @@
       "../../../api/units:data_rate",
       "../../../api/units:data_size",
       "../../../api/units:timestamp",
-      "../../../rtc_base",
       "../../../rtc_base:checks",
       "../../../rtc_base:ip_address",
       "../../../rtc_base:rtc_event",
diff --git a/test/peer_scenario/BUILD.gn b/test/peer_scenario/BUILD.gn
index db86412..00492a1 100644
--- a/test/peer_scenario/BUILD.gn
+++ b/test/peer_scenario/BUILD.gn
@@ -50,7 +50,6 @@
       "../../pc:pc_test_utils",
       "../../pc:rtp_transport_internal",
       "../../pc:session_description",
-      "../../rtc_base",
       "../../rtc_base:null_socket_server",
       "../../rtc_base:stringutils",
       "../../rtc_base:task_queue_for_test",
diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn
index 3e7208e..5da6dce 100644
--- a/test/scenario/BUILD.gn
+++ b/test/scenario/BUILD.gn
@@ -128,7 +128,6 @@
       "../../modules/video_coding:webrtc_vp8",
       "../../modules/video_coding:webrtc_vp9",
       "../../modules/video_coding/svc:scalability_mode_util",
-      "../../rtc_base",
       "../../rtc_base:checks",
       "../../rtc_base:copy_on_write_buffer",
       "../../rtc_base:net_helper",
diff --git a/test/time_controller/BUILD.gn b/test/time_controller/BUILD.gn
index 8f552a8..b4b368a 100644
--- a/test/time_controller/BUILD.gn
+++ b/test/time_controller/BUILD.gn
@@ -30,7 +30,6 @@
     "../../api/task_queue:default_task_queue_factory",
     "../../api/units:time_delta",
     "../../api/units:timestamp",
-    "../../rtc_base",
     "../../rtc_base:checks",
     "../../rtc_base:null_socket_server",
     "../../rtc_base:platform_thread_types",
@@ -59,7 +58,6 @@
       "../:test_support",
       "../../api:time_controller",
       "../../api/units:time_delta",
-      "../../rtc_base",
       "../../rtc_base:macromagic",
       "../../rtc_base:rtc_event",
       "../../rtc_base:rtc_task_queue",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index 0878dfa..e21e1c7 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -908,7 +908,6 @@
       "../modules/video_coding/svc:scalability_structures",
       "../modules/video_coding/svc:scalable_video_controller",
       "../modules/video_coding/timing:timing_module",
-      "../rtc_base",
       "../rtc_base:byte_buffer",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",