From 3a9e6877e5ef7411fe149e39b5af18ff30d802fe Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Tue, 26 Apr 2022 22:54:59 +0200 Subject: [PATCH] Cleanup rtc_base_approved target Removed all unused or transitional parts Bug: webrtc:9838 Change-Id: I6bc14e4e0ac09ab27e4d739ac76bb6a4dfff2cb7 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/260140 Commit-Queue: Florent Castelli Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#36741} --- modules/desktop_capture/BUILD.gn | 1 + rtc_base/BUILD.gn | 98 ++------------------------------ sdk/BUILD.gn | 4 ++ 3 files changed, 11 insertions(+), 92 deletions(-) diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn index 3bf73eba95..78966bb16f 100644 --- a/modules/desktop_capture/BUILD.gn +++ b/modules/desktop_capture/BUILD.gn @@ -319,6 +319,7 @@ if (is_mac) { "../../api:sequence_checker", "../../rtc_base", "../../rtc_base:checks", + "../../rtc_base:event_tracer", "../../rtc_base:logging", "../../rtc_base:timeutils", "../../rtc_base/system:rtc_export", diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 07137aae91..94d2298d89 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -80,85 +80,9 @@ rtc_source_set("callback_list") { # the old concept of rtc_base and rtc_base_approved. rtc_source_set("rtc_base_approved") { visibility = [ "*" ] - deps = [ - ":atomicops", - ":bit_buffer", - ":buffer", - ":buffer_queue", - ":byte_buffer", - ":byte_order", - ":checks", - ":copy_on_write_buffer", - ":event_tracer", - ":histogram_percentile_counter", - ":location", - ":logging", - ":macromagic", - ":mod_ops", - ":moving_max_counter", - ":one_time_event", - ":platform_thread", - ":platform_thread_types", - ":race_checker", - ":random", - ":rate_statistics", - ":rate_tracker", - ":refcount", - ":rtc_event", - ":safe_conversions", - ":sample_counter", - ":stringutils", - ":strong_alias", - ":swap_queue", - ":timestamp_aligner", - ":timeutils", - ":type_traits", - ":zero_memory", - ":zero_memory", - "../api:array_view", - "../api:scoped_refptr", - "../api:sequence_checker", - "synchronization:mutex", - "system:arch", - "system:no_unique_address", - "system:rtc_export", - ] - absl_deps = [ - "//third_party/abseil-cpp/absl/base:core_headers", - "//third_party/abseil-cpp/absl/numeric:bits", - "//third_party/abseil-cpp/absl/strings", - "//third_party/abseil-cpp/absl/types:optional", - ] - public_deps = [] # no-presubmit-check TODO(webrtc:8603) - - sources = [ - "bit_buffer.h", # Transitional, use :bit_buffer - "buffer.h", # Transitional, use :buffer - "buffer_queue.h", # Transitional, use :buffer_queue - "byte_buffer.h", # Transitional, use :byte_buffer - "byte_order.h", # Transitional, use :byte_order - "copy_on_write_buffer.h", # Transitional, use :copy_on_write_buffer - "event_tracer.h", # Transitional, use :event_tracer - "location.h", # Transitional, use :location - "numerics/histogram_percentile_counter.h", # Transitional, use - # :histogram_percentile_counter - "numerics/mod_ops.h", # Transitional, use :mod_ops - "numerics/moving_max_counter.h", # Transitional, use :moving_max_counter - "numerics/sample_counter.h", # Transitional, use :sample_counter - "one_time_event.h", # Transitional, use :one_time_event - "race_checker.h", # Transitional, use :race_checker - "random.h", # Transitional, use :random - "rate_statistics.h", # Transitional, use :rate_statistics - "rate_tracker.h", # Transitional, use :rate_tracker - "strong_alias.h", # Transitional, use :strong_alias - "swap_queue.h", # Transitional, use :swap_queue - "timestamp_aligner.h", # Transitional, use :timestamp_aligner - "trace_event.h", # Transitional, use :event_tracer - "zero_memory.h", # Transitional, use :zero_memory - ] if (is_win) { - sources += [ + sources = [ "win/get_activation_factory.cc", "win/get_activation_factory.h", "win/hstring.cc", @@ -168,6 +92,11 @@ rtc_source_set("rtc_base_approved") { "win/windows_version.cc", "win/windows_version.h", ] + deps = [ + ":checks", + ":logging", + ":stringutils", + ] data_deps = [ "//build/win:runtime_libs" ] } @@ -178,21 +107,6 @@ rtc_source_set("rtc_base_approved") { "win/create_direct3d_device.h", ] } - - if (is_nacl) { - public_deps += # no-presubmit-check TODO(webrtc:8603) - [ "//native_client_sdk/src/libraries/nacl_io" ] - } - - if (is_android) { - libs = [ "log" ] - } - - if (build_with_chromium) { - # Remove when the dependency has been propagated to Chromium - public_deps += # no-presubmit-check TODO(webrtc:8603) - [ ":timestamp_aligner" ] - } } rtc_source_set("buffer") { diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index b8de8be7b1..866cee581c 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -277,6 +277,7 @@ if (is_ios || is_mac) { "../modules/audio_device:audio_device_generic", "../rtc_base", "../rtc_base:atomicops", + "../rtc_base:buffer", "../rtc_base:checks", "../rtc_base:logging", "../rtc_base:macromagic", @@ -1579,6 +1580,7 @@ if (is_ios || is_mac) { "../api/video_codecs:video_codecs_api", "../common_video", "../rtc_base", + "../rtc_base:buffer", "../rtc_base:logging", "../rtc_base:refcount", "../rtc_base:threading", @@ -1673,6 +1675,7 @@ if (is_ios || is_mac) { deps = [ "../common_video", "../modules/video_coding:webrtc_h264", + "../rtc_base:buffer", "../rtc_base:checks", "../rtc_base:logging", "../rtc_base:rtc_base_approved", @@ -1712,6 +1715,7 @@ if (is_ios || is_mac) { "../api/video_codecs:video_codecs_api", "../common_video", "../modules/video_coding:video_codec_interface", + "../rtc_base:buffer", "../rtc_base:checks", "../rtc_base:logging", "../rtc_base:rtc_base_approved",