From bddfe0215c8de86605398e32a6b1411f7bfed55c Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Mon, 4 Apr 2022 15:03:10 +0200 Subject: [PATCH] Remove //rtc_base:atomicops from public deps Bug: webrtc:8603 Change-Id: If1fb37e44d5ab277e16895ca50325b3a86bd135f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/257907 Auto-Submit: Florent Castelli Reviewed-by: Mirko Bonadei Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#36432} --- media/BUILD.gn | 1 + modules/audio_processing/BUILD.gn | 3 +++ modules/audio_processing/aec3/BUILD.gn | 1 + modules/audio_processing/agc/BUILD.gn | 1 + rtc_base/BUILD.gn | 4 +++- sdk/BUILD.gn | 2 ++ sdk/android/BUILD.gn | 1 + system_wrappers/BUILD.gn | 1 + video/BUILD.gn | 1 + 9 files changed, 14 insertions(+), 1 deletion(-) diff --git a/media/BUILD.gn b/media/BUILD.gn index ef70cb0672..060ffebed5 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -154,6 +154,7 @@ rtc_library("rtc_simulcast_encoder_adapter") { "../common_video", "../modules/video_coding:video_codec_interface", "../modules/video_coding:video_coding_utility", + "../rtc_base:atomicops", "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../rtc_base/experiments:encoder_info_settings", diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn index 91793837d2..3028b45ea8 100644 --- a/modules/audio_processing/BUILD.gn +++ b/modules/audio_processing/BUILD.gn @@ -174,6 +174,7 @@ rtc_library("audio_processing") { "../../audio/utility:audio_frame_operations", "../../common_audio:common_audio_c", "../../common_audio/third_party/ooura:fft_size_256", + "../../rtc_base:atomicops", "../../rtc_base:checks", "../../rtc_base:gtest_prod", "../../rtc_base:ignore_wundef", @@ -234,6 +235,7 @@ rtc_library("residual_echo_detector") { ":api", ":apm_logging", "../../api:array_view", + "../../rtc_base:atomicops", "../../rtc_base:checks", "../../rtc_base:logging", "../../rtc_base:rtc_base_approved", @@ -470,6 +472,7 @@ if (rtc_include_tests) { ":audio_processing", ":audioproc_test_utils", "../../api:array_view", + "../../rtc_base:atomicops", "../../rtc_base:protobuf_utils", "../../rtc_base:rtc_base_approved", "../../system_wrappers", diff --git a/modules/audio_processing/aec3/BUILD.gn b/modules/audio_processing/aec3/BUILD.gn index 3ce494346f..2c4d26f5d1 100644 --- a/modules/audio_processing/aec3/BUILD.gn +++ b/modules/audio_processing/aec3/BUILD.gn @@ -139,6 +139,7 @@ rtc_library("aec3") { "../../../api/audio:aec3_config", "../../../api/audio:echo_control", "../../../common_audio:common_audio_c", + "../../../rtc_base:atomicops", "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", "../../../rtc_base:safe_minmax", diff --git a/modules/audio_processing/agc/BUILD.gn b/modules/audio_processing/agc/BUILD.gn index eef1b77560..980542c190 100644 --- a/modules/audio_processing/agc/BUILD.gn +++ b/modules/audio_processing/agc/BUILD.gn @@ -30,6 +30,7 @@ rtc_library("agc") { "../../../api:array_view", "../../../common_audio", "../../../common_audio:common_audio_c", + "../../../rtc_base:atomicops", "../../../rtc_base:checks", "../../../rtc_base:gtest_prod", "../../../rtc_base:logging", diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index c762b9f1d0..a1fa72a801 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -80,6 +80,7 @@ rtc_source_set("callback_list") { rtc_library("rtc_base_approved") { visibility = [ "*" ] deps = [ + ":atomicops", ":checks", ":rtc_task_queue", ":safe_compare", @@ -172,7 +173,6 @@ rtc_library("rtc_base_approved") { } public_deps += [ # no-presubmit-check TODO(webrtc:8603) - ":atomicops", ":logging", ":macromagic", ":platform_thread", @@ -1393,6 +1393,7 @@ if (rtc_include_tests) { sources += [ "win/windows_version_unittest.cc" ] } deps = [ + ":atomicops", ":bitstream_reader", ":bounded_inline_vector", ":checks", @@ -1532,6 +1533,7 @@ if (rtc_include_tests) { "unique_id_generator_unittest.cc", ] deps = [ + ":atomicops", ":checks", ":gunit_helpers", ":ip_address", diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index 5b817372f4..b19cb09500 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -273,6 +273,7 @@ if (is_ios || is_mac) { "../modules/audio_device:audio_device_buffer", "../modules/audio_device:audio_device_generic", "../rtc_base", + "../rtc_base:atomicops", "../rtc_base:checks", "../rtc_base:threading", "../system_wrappers:field_trial", @@ -338,6 +339,7 @@ if (is_ios || is_mac) { ":base_objc", ":helpers_objc", "../rtc_base", + "../rtc_base:atomicops", "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../rtc_base/synchronization:mutex", diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index 4c42fa78d8..62b0c0ebdc 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -940,6 +940,7 @@ if (current_os == "linux" || is_android) { ":generated_external_classes_jni", ":generated_native_api_jni", ":internal_jni", + "../../rtc_base:atomicops", "//api:array_view", "//rtc_base:checks", "//rtc_base:rtc_base_approved", diff --git a/system_wrappers/BUILD.gn b/system_wrappers/BUILD.gn index fc956a5a84..1f66b63937 100644 --- a/system_wrappers/BUILD.gn +++ b/system_wrappers/BUILD.gn @@ -102,6 +102,7 @@ rtc_library("metrics") { defines = [ "WEBRTC_EXCLUDE_METRICS_DEFAULT" ] } deps = [ + "../rtc_base:atomicops", "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../rtc_base/synchronization:mutex", diff --git a/video/BUILD.gn b/video/BUILD.gn index 74f09b2df7..2ef5be1efc 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -109,6 +109,7 @@ rtc_library("video") { "../modules/video_coding:video_codec_interface", "../modules/video_coding:video_coding_utility", "../modules/video_processing", + "../rtc_base:atomicops", "../rtc_base:checks", "../rtc_base:rate_limiter", "../rtc_base:rtc_base",