diff --git a/api/adaptation/DEPS b/api/adaptation/DEPS index cab7fb8e14..734e152497 100644 --- a/api/adaptation/DEPS +++ b/api/adaptation/DEPS @@ -1,6 +1,6 @@ specific_include_rules = { "resource\.h": [ - # ref_count.h is a public_deps of rtc_base_approved. Necessary because of + # ref_count.h is a public_deps of rtc_base:refcount. Necessary because of # rtc::RefCountInterface. "+rtc_base/ref_count.h", ], diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn index 25ca37f2b8..61b2dfd767 100644 --- a/modules/audio_device/BUILD.gn +++ b/modules/audio_device/BUILD.gn @@ -118,7 +118,6 @@ rtc_source_set("windows_core_audio_utility") { "../../rtc_base:logging", "../../rtc_base:macromagic", "../../rtc_base:platform_thread_types", - "../../rtc_base:rtc_base_approved", "../../rtc_base:stringutils", "../../rtc_base/win:windows_version", ] @@ -161,7 +160,6 @@ rtc_source_set("audio_device_module_from_input_and_output") { "../../rtc_base:macromagic", "../../rtc_base:platform_thread", "../../rtc_base:refcount", - "../../rtc_base:rtc_base_approved", "../../rtc_base:safe_conversions", "../../rtc_base:stringutils", "../../rtc_base:timeutils", @@ -425,7 +423,6 @@ if (rtc_include_tests && !build_with_chromium) { "../../rtc_base:logging", "../../rtc_base:macromagic", "../../rtc_base:race_checker", - "../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_event", "../../rtc_base:safe_conversions", "../../rtc_base:timeutils", diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn index 94f0c8e5d8..cdf4776497 100644 --- a/modules/desktop_capture/BUILD.gn +++ b/modules/desktop_capture/BUILD.gn @@ -587,9 +587,7 @@ rtc_library("desktop_capture_generic") { deps += [ "../../rtc_base:sanitizer" ] } - if (build_with_mozilla) { - deps += [ "../../rtc_base:rtc_base_approved" ] - } else { + if (!build_with_mozilla) { deps += [ "//third_party/libyuv" ] } diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 1e1ca474aa..7765c61202 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -75,13 +75,6 @@ rtc_source_set("callback_list") { ] } -# The subset of rtc_base approved for use outside of libjingle. -# TODO(bugs.webrtc.org/9838): Create small and focused build targets and remove -# the old concept of rtc_base and rtc_base_approved. -rtc_source_set("rtc_base_approved") { - visibility = [ "*" ] -} - rtc_source_set("buffer") { visibility = [ "*" ] sources = [ "buffer.h" ] @@ -495,7 +488,6 @@ rtc_library("rate_limiter") { deps = [ ":macromagic", ":rate_statistics", - ":rtc_base_approved", "../system_wrappers", "synchronization:mutex", ] @@ -760,7 +752,6 @@ rtc_library("rtc_numerics") { deps = [ ":checks", ":mod_ops", - ":rtc_base_approved", ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } @@ -853,7 +844,6 @@ rtc_library("ip_address") { deps = [ ":byte_order", ":net_helpers", - ":rtc_base_approved", ":stringutils", "system:rtc_export", ] @@ -875,7 +865,6 @@ rtc_library("socket_address") { ":ip_address", ":logging", ":net_helpers", - ":rtc_base_approved", ":safe_conversions", ":stringutils", "system:rtc_export", @@ -946,7 +935,6 @@ rtc_library("threading") { ":platform_thread", ":platform_thread_types", ":refcount", - ":rtc_base_approved", ":rtc_event", ":rtc_task_queue", ":socket_address", @@ -1045,7 +1033,6 @@ if (is_win) { ":checks", ":logging", ":macromagic", - ":rtc_base_approved", ":stringutils", ] @@ -1122,7 +1109,6 @@ rtc_library("rtc_base") { "//third_party/abseil-cpp/absl/strings", "//third_party/abseil-cpp/absl/types:optional", ] - public_deps = [ ":rtc_base_approved" ] # no-presubmit-check TODO(webrtc:8603) public_configs = [] sources = [ @@ -1415,7 +1401,6 @@ rtc_library("task_queue_for_test") { ":checks", ":location", ":macromagic", - ":rtc_base_approved", ":rtc_event", ":rtc_task_queue", "../api/task_queue", @@ -1455,7 +1440,6 @@ if (rtc_include_tests) { deps = [ ":gunit_helpers", ":rtc_base", - ":rtc_base_approved", ":rtc_event", ":rtc_operations_chain", ":threading", @@ -1585,7 +1569,6 @@ if (rtc_include_tests) { ":rate_tracker", ":refcount", ":rtc_base", - ":rtc_base_approved", ":rtc_base_tests_utils", ":rtc_event", ":rtc_numerics", @@ -1640,7 +1623,6 @@ if (rtc_include_tests) { sources = [ "task_queue_unittest.cc" ] deps = [ ":gunit_helpers", - ":rtc_base_approved", ":rtc_base_tests_utils", ":rtc_event", ":rtc_task_queue", @@ -1658,7 +1640,6 @@ if (rtc_include_tests) { sources = [ "weak_ptr_unittest.cc" ] deps = [ ":gunit_helpers", - ":rtc_base_approved", ":rtc_base_tests_utils", ":rtc_event", ":task_queue_for_test", @@ -1681,7 +1662,6 @@ if (rtc_include_tests) { "numerics/sequence_number_util_unittest.cc", ] deps = [ - ":rtc_base_approved", ":rtc_numerics", "../test:test_main", "../test:test_support", @@ -1739,7 +1719,6 @@ if (rtc_include_tests) { ":null_socket_server", ":refcount", ":rtc_base", - ":rtc_base_approved", ":rtc_base_tests_utils", ":rtc_event", ":safe_conversions", diff --git a/rtc_base/experiments/BUILD.gn b/rtc_base/experiments/BUILD.gn index fffd5a0f79..213377218e 100644 --- a/rtc_base/experiments/BUILD.gn +++ b/rtc_base/experiments/BUILD.gn @@ -15,7 +15,6 @@ rtc_library("alr_experiment") { ] deps = [ "..:logging", - "../:rtc_base_approved", "../../api:field_trials_view", "../../api/transport:field_trial_based_config", ] @@ -60,7 +59,6 @@ rtc_library("quality_rampup_experiment") { deps = [ ":field_trial_parser", "..:logging", - "../:rtc_base_approved", "../../api:field_trials_view", "../../api/transport:field_trial_based_config", "../../system_wrappers:field_trial", @@ -76,7 +74,6 @@ rtc_library("quality_scaler_settings") { deps = [ ":field_trial_parser", "..:logging", - "../:rtc_base_approved", "../../api:field_trials_view", "../../api/transport:field_trial_based_config", "../../system_wrappers:field_trial", @@ -92,7 +89,6 @@ rtc_library("bandwidth_quality_scaler_settings") { deps = [ ":field_trial_parser", "..:logging", - "../:rtc_base_approved", "../../api:field_trials_view", "../../api/transport:field_trial_based_config", "../../system_wrappers:field_trial", @@ -107,7 +103,6 @@ rtc_library("quality_scaling_experiment") { ] deps = [ "..:logging", - "../:rtc_base_approved", "../../api/video_codecs:video_codecs_api", "../../system_wrappers:field_trial", ] @@ -121,7 +116,6 @@ rtc_library("normalize_simulcast_size_experiment") { ] deps = [ "..:logging", - "../:rtc_base_approved", "../../system_wrappers:field_trial", ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] @@ -135,7 +129,6 @@ rtc_library("balanced_degradation_settings") { deps = [ ":field_trial_parser", "..:logging", - "../:rtc_base_approved", "../../api:field_trials_view", "../../api/video_codecs:video_codecs_api", "../../system_wrappers:field_trial", @@ -151,7 +144,6 @@ rtc_library("cpu_speed_experiment") { deps = [ ":field_trial_parser", "..:logging", - "../:rtc_base_approved", "../../system_wrappers:field_trial", ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] @@ -165,7 +157,6 @@ rtc_library("encoder_info_settings") { deps = [ ":field_trial_parser", "..:logging", - "../:rtc_base_approved", "../../api/video_codecs:video_codecs_api", "../../system_wrappers:field_trial", ] @@ -182,7 +173,6 @@ rtc_library("rtt_mult_experiment") { ] deps = [ "..:logging", - "../:rtc_base_approved", "../../system_wrappers:field_trial", ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] @@ -195,7 +185,6 @@ rtc_library("jitter_upper_bound_experiment") { ] deps = [ "..:logging", - "../:rtc_base_approved", "../../system_wrappers:field_trial", ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] @@ -210,7 +199,6 @@ rtc_library("rate_control_settings") { ":field_trial_parser", "..:logging", "..:safe_conversions", - "../:rtc_base_approved", "../../api:field_trials_view", "../../api/transport:field_trial_based_config", "../../api/units:data_size", diff --git a/rtc_base/task_utils/BUILD.gn b/rtc_base/task_utils/BUILD.gn index a651d040b9..893031dfd1 100644 --- a/rtc_base/task_utils/BUILD.gn +++ b/rtc_base/task_utils/BUILD.gn @@ -57,7 +57,6 @@ if (rtc_include_tests) { ":pending_task_safety_flag", ":to_queued_task", "..:logging", - "..:rtc_base_approved", "..:rtc_event", "..:rtc_task_queue", "..:task_queue_for_test", @@ -71,7 +70,6 @@ if (rtc_include_tests) { deps = [ ":repeating_task", ":to_queued_task", - "..:rtc_base_approved", "..:rtc_event", "..:rtc_task_queue", "..:task_queue_for_test", diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index 866cee581c..c067159527 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -1678,7 +1678,6 @@ if (is_ios || is_mac) { "../rtc_base:buffer", "../rtc_base:checks", "../rtc_base:logging", - "../rtc_base:rtc_base_approved", ] } @@ -1718,7 +1717,6 @@ if (is_ios || is_mac) { "../rtc_base:buffer", "../rtc_base:checks", "../rtc_base:logging", - "../rtc_base:rtc_base_approved", "../rtc_base:timeutils", "//third_party/libyuv", ] diff --git a/video/BUILD.gn b/video/BUILD.gn index 58c9f9ac98..68dcfdd1ba 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -589,7 +589,6 @@ if (rtc_include_tests) { "../modules/video_coding:webrtc_vp9", "../rtc_base:macromagic", "../rtc_base:platform_thread", - "../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_tests_utils", "../rtc_base:rtc_event", "../rtc_base:rtc_numerics",