Merge "Convert absl_source_sets to cc_library_static instead of filegroup" into main am: c9b0c0bf2a am: 99634edf38 am: 4f176b60c6 am: f8bbbaddb2

Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/2675782

Change-Id: Id3739ae13103485367962a254bf7761235bedd1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 1258 insertions, 16303 deletions

diff --git a/Android.bp b/Android.bp
index 8ca1d6c206..b7a1852ac1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -179,30 +179,8 @@ cc_defaults {
 cc_library_static {
     name: "webrtc_L16__audio_decoder_L16",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/audio_codecs/L16/audio_decoder_L16.cc",
-    ],
+    srcs: ["api/audio_codecs/L16/audio_decoder_L16.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__pcm16b",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -211,31 +189,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_L16__audio_encoder_L16",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/audio_codecs/L16/audio_encoder_L16.cc",
-    ],
+    srcs: ["api/audio_codecs/L16/audio_encoder_L16.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__pcm16b",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -244,251 +199,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc___webrtc",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_coding__default_neteq_factory",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__default_neteq_controller_factory",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_neteq__tick_timer",
-        ":webrtc_numeric__int128",
-        ":webrtc_pc__channel",
-        ":webrtc_pc__data_channel_controller",
-        ":webrtc_pc__dtls_srtp_transport",
-        ":webrtc_pc__dtls_transport",
-        ":webrtc_pc__external_hmac",
-        ":webrtc_pc__ice_transport",
-        ":webrtc_pc__jsep_transport",
-        ":webrtc_pc__jsep_transport_collection",
-        ":webrtc_pc__jsep_transport_controller",
-        ":webrtc_pc__legacy_stats_collector",
-        ":webrtc_pc__local_audio_source",
-        ":webrtc_pc__media_session",
-        ":webrtc_pc__peer_connection",
-        ":webrtc_pc__peer_connection_factory",
-        ":webrtc_pc__rtc_stats_collector",
-        ":webrtc_pc__rtc_stats_traversal",
-        ":webrtc_pc__rtcp_mux_filter",
-        ":webrtc_pc__rtp_media_utils",
-        ":webrtc_pc__rtp_transport",
-        ":webrtc_pc__sctp_transport",
-        ":webrtc_pc__sctp_utils",
-        ":webrtc_pc__sdp_offer_answer",
-        ":webrtc_pc__sdp_serializer",
-        ":webrtc_pc__sdp_utils",
-        ":webrtc_pc__session_description",
-        ":webrtc_pc__simulcast_description",
-        ":webrtc_pc__srtp_filter",
-        ":webrtc_pc__srtp_session",
-        ":webrtc_pc__srtp_transport",
-        ":webrtc_pc__track_media_info_map",
-        ":webrtc_pc__transport_stats",
-        ":webrtc_pc__video_track_source_proxy",
-        ":webrtc_pc__webrtc_sdp",
-        ":webrtc_pc__webrtc_session_description_factory",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_public__factory",
-        ":webrtc_public__socket",
-        ":webrtc_public__utils",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtc_base__rtc_operations_chain",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_svc__svc_rate_allocator",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_capture__video_capture_internal_impl",
-        ":webrtc_video_codecs__scalability_mode",
-        ":webrtc_video_coding__webrtc_vp8_scalability",
-    ],
+    srcs: [],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__audio_options_api",
-        "webrtc_api__candidate",
-        "webrtc_api__create_peerconnection_factory",
-        "webrtc_api__dtls_transport_interface",
-        "webrtc_api__ice_transport_factory",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtc_event_log_output_file",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_api__transport_api",
-        "webrtc_audio__audio",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_codecs__builtin_audio_decoder_factory",
-        "webrtc_audio_codecs__builtin_audio_encoder_factory",
-        "webrtc_audio_coding__neteq",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_audio_processing__audio_processing_statistics",
-        "webrtc_base64__base64",
-        "webrtc_call__call",
-        "webrtc_call__call_interfaces",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_call__rtp_receiver",
-        "webrtc_call__rtp_sender",
-        "webrtc_call__video_stream_api",
-        "webrtc_common_audio__common_audio",
-        "webrtc_common_video__common_video",
-        "webrtc_config__encoder_config",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_crypto__options",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_experiments__stable_target_rate_experiment",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_logging__ice_log",
-        "webrtc_media__rtc_audio_video",
-        "webrtc_media__rtc_media_base",
-        "webrtc_media__rtc_sdp_video_format_utils",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_metrics__metric",
-        "webrtc_network__sent_packet",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_p2p__rtc_p2p",
-        "webrtc_packet__chunk",
-        "webrtc_packet__sctp_packet",
-        "webrtc_pc__audio_rtp_receiver",
-        "webrtc_pc__audio_track",
-        "webrtc_pc__connection_context",
-        "webrtc_pc__data_channel_utils",
-        "webrtc_pc__dtmf_sender",
-        "webrtc_pc__ice_server_parsing",
-        "webrtc_pc__jitter_buffer_delay",
-        "webrtc_pc__media_protocol_names",
-        "webrtc_pc__media_stream",
-        "webrtc_pc__media_stream_observer",
-        "webrtc_pc__peer_connection_message_handler",
-        "webrtc_pc__proxy",
-        "webrtc_pc__remote_audio_source",
-        "webrtc_pc__rtp_parameters_conversion",
-        "webrtc_pc__rtp_receiver",
-        "webrtc_pc__rtp_sender",
-        "webrtc_pc__rtp_transceiver",
-        "webrtc_pc__rtp_transmission_manager",
-        "webrtc_pc__sctp_data_channel",
-        "webrtc_pc__transceiver_list",
-        "webrtc_pc__usage_pattern",
-        "webrtc_pc__video_rtp_receiver",
-        "webrtc_pc__video_track",
-        "webrtc_pc__video_track_source",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__random",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__weak_ptr",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtc_event_log__rtc_event_log_factory",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_socket__dcsctp_socket",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__default_task_queue_factory",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_transport__bitrate_settings",
-        "webrtc_transport__field_trial_based_config",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__builtin_video_bitrate_allocator_factory",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__frame_decode_timing",
-        "webrtc_video__video",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_capture__video_capture_module",
-        "webrtc_video_codecs__builtin_video_decoder_factory",
-        "webrtc_video_codecs__builtin_video_encoder_factory",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__webrtc_h264",
-        "webrtc_video_coding__webrtc_vp8",
-        "webrtc_video_coding__webrtc_vp9",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -498,53 +210,6 @@ cc_library_static {
     name: "webrtc_adaptation__resource_adaptation",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "call/adaptation/adaptation_constraint.cc",
         "call/adaptation/broadcast_resource_listener.cc",
         "call/adaptation/degradation_preference_provider.cc",
@@ -557,82 +222,16 @@ cc_library_static {
         "call/adaptation/video_stream_input_state_provider.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_config__encoder_config",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__balanced_degradation_settings",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_coding_utility",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
 //api/adaptation:resource_adaptation_api
 */
-filegroup {
+cc_library_static {
     name: "webrtc_adaptation__resource_adaptation_api",
+    defaults: ["webrtc_defaults"],
     srcs: ["api/adaptation/resource.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -642,54 +241,6 @@ cc_library_static {
     name: "webrtc_adaptation__video_adaptation",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "video/adaptation/balanced_constraint.cc",
         "video/adaptation/bandwidth_quality_scaler_resource.cc",
         "video/adaptation/bitrate_constraint.cc",
@@ -702,83 +253,6 @@ cc_library_static {
         "video/adaptation/video_stream_encoder_resource_manager.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_adaptation__resource_adaptation",
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_config__encoder_config",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__balanced_degradation_settings",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_experiments__quality_rampup_experiment",
-        "webrtc_experiments__quality_scaler_settings",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_task_utils__repeating_task",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_coding_utility",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -788,15 +262,6 @@ cc_library_static {
     name: "webrtc_aec3__aec3",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/aec3/adaptive_fir_filter.cc",
         "modules/audio_processing/aec3/adaptive_fir_filter_erl.cc",
         "modules/audio_processing/aec3/aec3_common.cc",
@@ -856,35 +321,10 @@ cc_library_static {
         "modules/audio_processing/aec3/transparent_mode.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio__aec3_config",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_audio_processing__audio_buffer",
-        "webrtc_audio_processing__high_pass_filter",
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__race_checker",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_utility__cascaded_biquad_filter",
-    ],
     arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
         x86_64: {
-            static_libs: ["webrtc_aec3__aec3_avx2"],
         },
         x86: {
-            static_libs: ["webrtc_aec3__aec3_avx2"],
         },
     },
 }
@@ -896,15 +336,6 @@ cc_library_static {
     name: "webrtc_aec3__aec3_avx2",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/aec3/adaptive_fir_filter_avx2.cc",
         "modules/audio_processing/aec3/adaptive_fir_filter_erl_avx2.cc",
         "modules/audio_processing/aec3/fft_data_avx2.cc",
@@ -912,16 +343,6 @@ cc_library_static {
         "modules/audio_processing/aec3/vector_math_avx2.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
     arch: {
         arm: {
             enabled: false,
@@ -941,27 +362,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_aec_dump__null_aec_dump_factory",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/aec_dump/null_aec_dump_factory.cc",
-    ],
+    srcs: ["modules/audio_processing/aec_dump/null_aec_dump_factory.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_processing__api",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-    ],
 }
 
 /* From target:
@@ -971,35 +373,14 @@ cc_library_static {
     name: "webrtc_aecm__aecm_core",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/aecm/aecm_core.cc",
         "modules/audio_processing/aecm/aecm_core_c.cc",
         "modules/audio_processing/aecm/echo_control_mobile.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_utility__legacy_delay_estimator",
-    ],
     arch: {
         arm: {
-            srcs: [
-                ":webrtc_common_audio__common_audio_c_arm_asm",
-                "modules/audio_processing/aecm/aecm_core_neon.cc",
-            ],
+            srcs: ["modules/audio_processing/aecm/aecm_core_neon.cc"],
         },
         arm64: {
             srcs: ["modules/audio_processing/aecm/aecm_core_neon.cc"],
@@ -1013,40 +394,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_agc2__adaptive_digital",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/agc2/adaptive_digital_gain_controller.cc",
-    ],
+    srcs: ["modules/audio_processing/agc2/adaptive_digital_gain_controller.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__adaptive_digital_gain_applier",
-        "webrtc_agc2__noise_level_estimator",
-        "webrtc_agc2__saturation_protector",
-        "webrtc_agc2__speech_level_estimator",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_common_audio__common_audio",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -1055,38 +404,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_agc2__adaptive_digital_gain_applier",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/agc2/adaptive_digital_gain_applier.cc",
-    ],
+    srcs: ["modules/audio_processing/agc2/adaptive_digital_gain_applier.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__gain_applier",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_common_audio__common_audio",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -1095,19 +414,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_agc2__biquad_filter",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "modules/audio_processing/agc2/biquad_filter.cc",
-    ],
+    srcs: ["modules/audio_processing/agc2/biquad_filter.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -1117,35 +425,10 @@ cc_library_static {
     name: "webrtc_agc2__clipping_predictor",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/agc2/clipping_predictor.cc",
         "modules/audio_processing/agc2/clipping_predictor_level_buffer.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_processing__api",
-        "webrtc_common_audio__common_audio",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -1154,27 +437,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_agc2__cpu_features",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/agc2/cpu_features.cc",
-    ],
+    srcs: ["modules/audio_processing/agc2/cpu_features.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
 }
 
 /* From target:
@@ -1184,37 +448,11 @@ cc_library_static {
     name: "webrtc_agc2__fixed_digital",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/agc2/fixed_digital_level_estimator.cc",
         "modules/audio_processing/agc2/interpolated_gain_curve.cc",
         "modules/audio_processing/agc2/limiter.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_common_audio__common_audio",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -1223,19 +461,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_agc2__gain_applier",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "modules/audio_processing/agc2/gain_applier.cc",
-    ],
+    srcs: ["modules/audio_processing/agc2/gain_applier.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -1245,38 +472,10 @@ cc_library_static {
     name: "webrtc_agc2__input_volume_controller",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/agc2/input_volume_controller.cc",
         "modules/audio_processing/agc2/speech_probability_buffer.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__clipping_predictor",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__audio_buffer",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -1285,27 +484,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_agc2__input_volume_stats_reporter",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/agc2/input_volume_stats_reporter.cc",
-    ],
+    srcs: ["modules/audio_processing/agc2/input_volume_stats_reporter.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__metrics",
-    ],
 }
 
 /* From target:
@@ -1314,34 +494,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_agc2__noise_level_estimator",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/agc2/noise_level_estimator.cc",
-    ],
+    srcs: ["modules/audio_processing/agc2/noise_level_estimator.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__biquad_filter",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -1351,33 +505,10 @@ cc_library_static {
     name: "webrtc_agc2__saturation_protector",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/agc2/saturation_protector.cc",
         "modules/audio_processing/agc2/saturation_protector_buffer.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -1386,35 +517,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_agc2__speech_level_estimator",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/agc2/speech_level_estimator.cc",
-    ],
+    srcs: ["modules/audio_processing/agc2/speech_level_estimator.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -1423,42 +527,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_agc2__vad_wrapper",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/agc2/vad_wrapper.cc",
-    ],
+    srcs: ["modules/audio_processing/agc2/vad_wrapper.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_common_audio__common_audio",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rnn_vad__rnn_vad",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -1467,43 +537,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_agc__agc",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/agc/agc_manager_direct.cc",
-    ],
+    srcs: ["modules/audio_processing/agc/agc_manager_direct.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__clipping_predictor",
-        "webrtc_agc__level_estimation",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_audio_processing__audio_buffer",
-        "webrtc_common_audio__common_audio",
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_vad__vad",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -1513,35 +548,10 @@ cc_library_static {
     name: "webrtc_agc__legacy_agc",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/agc/legacy/analog_agc.cc",
         "modules/audio_processing/agc/legacy/digital_agc.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_common_audio__common_audio",
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_256",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -1551,34 +561,11 @@ cc_library_static {
     name: "webrtc_agc__level_estimation",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/agc/agc.cc",
         "modules/audio_processing/agc/loudness_histogram.cc",
         "modules/audio_processing/agc/utility.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_vad__vad",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -1587,23 +574,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_api__audio_options_api",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/audio_options.cc",
-    ],
+    srcs: ["api/audio_options.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__stringutils",
-    ],
 }
 
 /* From target:
@@ -1612,61 +584,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_api__candidate",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        "api/candidate.cc",
-    ],
+    srcs: ["api/candidate.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -1675,230 +594,9 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_api__create_peerconnection_factory",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_coding__default_neteq_factory",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__default_neteq_controller_factory",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_neteq__tick_timer",
-        ":webrtc_numeric__int128",
-        ":webrtc_pc__channel",
-        ":webrtc_pc__data_channel_controller",
-        ":webrtc_pc__dtls_srtp_transport",
-        ":webrtc_pc__dtls_transport",
-        ":webrtc_pc__external_hmac",
-        ":webrtc_pc__ice_transport",
-        ":webrtc_pc__jsep_transport",
-        ":webrtc_pc__jsep_transport_collection",
-        ":webrtc_pc__jsep_transport_controller",
-        ":webrtc_pc__legacy_stats_collector",
-        ":webrtc_pc__local_audio_source",
-        ":webrtc_pc__media_session",
-        ":webrtc_pc__peer_connection",
-        ":webrtc_pc__peer_connection_factory",
-        ":webrtc_pc__rtc_stats_collector",
-        ":webrtc_pc__rtc_stats_traversal",
-        ":webrtc_pc__rtcp_mux_filter",
-        ":webrtc_pc__rtp_media_utils",
-        ":webrtc_pc__rtp_transport",
-        ":webrtc_pc__sctp_transport",
-        ":webrtc_pc__sctp_utils",
-        ":webrtc_pc__sdp_offer_answer",
-        ":webrtc_pc__sdp_serializer",
-        ":webrtc_pc__session_description",
-        ":webrtc_pc__simulcast_description",
-        ":webrtc_pc__srtp_filter",
-        ":webrtc_pc__srtp_session",
-        ":webrtc_pc__srtp_transport",
-        ":webrtc_pc__track_media_info_map",
-        ":webrtc_pc__transport_stats",
-        ":webrtc_pc__video_track_source_proxy",
-        ":webrtc_pc__webrtc_sdp",
-        ":webrtc_pc__webrtc_session_description_factory",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_public__factory",
-        ":webrtc_public__socket",
-        ":webrtc_public__utils",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtc_base__rtc_operations_chain",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_svc__svc_rate_allocator",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_capture__video_capture_internal_impl",
-        ":webrtc_video_codecs__scalability_mode",
-        ":webrtc_video_coding__webrtc_vp8_scalability",
-        "api/create_peerconnection_factory.cc",
-    ],
+    srcs: ["api/create_peerconnection_factory.cc"],
     host_supported: true,
     cflags: ["-DHAVE_WEBRTC_VIDEO"],
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__audio_options_api",
-        "webrtc_api__candidate",
-        "webrtc_api__dtls_transport_interface",
-        "webrtc_api__ice_transport_factory",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__neteq",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_audio_processing__audio_processing_statistics",
-        "webrtc_base64__base64",
-        "webrtc_call__call_interfaces",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_call__rtp_receiver",
-        "webrtc_call__rtp_sender",
-        "webrtc_call__video_stream_api",
-        "webrtc_common_video__common_video",
-        "webrtc_config__encoder_config",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_crypto__options",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_experiments__stable_target_rate_experiment",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_media__rtc_audio_video",
-        "webrtc_media__rtc_media_base",
-        "webrtc_media__rtc_sdp_video_format_utils",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_network__sent_packet",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_p2p__rtc_p2p",
-        "webrtc_packet__chunk",
-        "webrtc_packet__sctp_packet",
-        "webrtc_pc__audio_track",
-        "webrtc_pc__connection_context",
-        "webrtc_pc__data_channel_utils",
-        "webrtc_pc__ice_server_parsing",
-        "webrtc_pc__media_protocol_names",
-        "webrtc_pc__media_stream",
-        "webrtc_pc__media_stream_observer",
-        "webrtc_pc__peer_connection_message_handler",
-        "webrtc_pc__proxy",
-        "webrtc_pc__rtp_parameters_conversion",
-        "webrtc_pc__rtp_receiver",
-        "webrtc_pc__rtp_sender",
-        "webrtc_pc__rtp_transceiver",
-        "webrtc_pc__rtp_transmission_manager",
-        "webrtc_pc__sctp_data_channel",
-        "webrtc_pc__transceiver_list",
-        "webrtc_pc__usage_pattern",
-        "webrtc_pc__video_track",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__random",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__weak_ptr",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtc_event_log__rtc_event_log_factory",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_socket__dcsctp_socket",
-        "webrtc_stats__rtc_stats",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__default_task_queue_factory",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_transport__bitrate_settings",
-        "webrtc_transport__field_trial_based_config",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__builtin_video_bitrate_allocator_factory",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__frame_decode_timing",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_capture__video_capture_module",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -1907,64 +605,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_api__dtls_transport_interface",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        "api/dtls_transport_interface.cc",
-    ],
+    srcs: ["api/dtls_transport_interface.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__rtc_error",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -1973,35 +615,18 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_api__field_trials",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/field_trials.cc",
-    ],
+    srcs: ["api/field_trials.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-    ],
 }
 
 /* From target:
 //api:field_trials_registry
 */
-filegroup {
+cc_library_static {
     name: "webrtc_api__field_trials_registry",
+    defaults: ["webrtc_defaults"],
     srcs: ["api/field_trials_registry.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -2010,123 +635,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_api__ice_transport_factory",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "api/ice_transport_factory.cc",
-    ],
+    srcs: ["api/ice_transport_factory.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_p2p__rtc_p2p",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -2136,53 +646,6 @@ cc_library_static {
     name: "webrtc_api__libjingle_peerconnection_api",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "api/data_channel_interface.cc",
         "api/jsep.cc",
         "api/jsep_ice_candidate.cc",
@@ -2193,81 +656,6 @@ cc_library_static {
         "api/sctp_transport_interface.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__audio_options_api",
-        "webrtc_api__candidate",
-        "webrtc_api__dtls_transport_interface",
-        "webrtc_api__field_trials",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_audio_processing__audio_processing_statistics",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_crypto__options",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_p2p__rtc_p2p",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_transport__bitrate_settings",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -2276,33 +664,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_api__media_stream_interface",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "api/media_stream_interface.cc",
-    ],
+    srcs: ["api/media_stream_interface.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__audio_options_api",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio_processing__audio_processing_statistics",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-    ],
 }
 
 /* From target:
@@ -2311,25 +674,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_api__rtc_error",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/rtc_error.cc",
-    ],
+    srcs: ["api/rtc_error.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -2338,27 +684,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_api__rtc_event_log_output_file",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/rtc_event_log_output_file.cc",
-    ],
+    srcs: ["api/rtc_event_log_output_file.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-    ],
 }
 
 /* From target:
@@ -2367,26 +694,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_api__rtp_headers",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/rtp_headers.cc",
-    ],
+    srcs: ["api/rtp_headers.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_units__timestamp",
-        "webrtc_video__video_rtp_headers",
-    ],
 }
 
 /* From target:
@@ -2395,27 +704,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_api__rtp_packet_info",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/rtp_packet_info.cc",
-    ],
+    srcs: ["api/rtp_packet_info.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__rtp_headers",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -2425,24 +715,10 @@ cc_library_static {
     name: "webrtc_api__rtp_parameters",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
         "api/media_types.cc",
         "api/rtp_parameters.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__stringutils",
-    ],
 }
 
 /* From target:
@@ -2451,77 +727,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_api__rtp_sender_interface",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "api/rtp_sender_interface.cc",
-    ],
+    srcs: ["api/rtp_sender_interface.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__dtls_transport_interface",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_parameters",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
 }
 
 /* From target:
@@ -2537,9 +744,11 @@ cc_library_static {
 /* From target:
 //api:wrapping_async_dns_resolver
 */
-filegroup {
+cc_library_static {
     name: "webrtc_api__wrapping_async_dns_resolver",
+    defaults: ["webrtc_defaults"],
     srcs: ["api/wrapping_async_dns_resolver.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -2548,28 +757,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_async_audio_processing__async_audio_processing",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/async_audio_processing/async_audio_processing.cc",
-    ],
+    srcs: ["modules/async_audio_processing/async_audio_processing.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio__audio_frame_api",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-    ],
 }
 
 /* From target:
@@ -2578,19 +767,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio__aec3_config",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "api/audio/echo_canceller3_config.cc",
-    ],
+    srcs: ["api/audio/echo_canceller3_config.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -2599,36 +777,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio__aec3_factory",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/audio/echo_canceller3_factory.cc",
-    ],
+    srcs: ["api/audio/echo_canceller3_factory.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_aec3__aec3",
-        "webrtc_audio__aec3_config",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -2638,56 +788,6 @@ cc_library_static {
     name: "webrtc_audio__audio",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_coding__default_neteq_factory",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__default_neteq_controller_factory",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_neteq__tick_timer",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "audio/audio_level.cc",
         "audio/audio_receive_stream.cc",
         "audio/audio_send_stream.cc",
@@ -2700,99 +800,6 @@ cc_library_static {
         "audio/remix_resample.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__transport_api",
-        "webrtc_async_audio_processing__async_audio_processing",
-        "webrtc_audio__aec3_factory",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__audio_coding",
-        "webrtc_audio_coding__audio_encoder_cng",
-        "webrtc_audio_coding__audio_network_adaptor_config",
-        "webrtc_audio_coding__neteq",
-        "webrtc_audio_coding__red",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_audio_processing__audio_frame_proxies",
-        "webrtc_audio_processing__audio_processing",
-        "webrtc_call__bitrate_allocator",
-        "webrtc_call__call_interfaces",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_common_audio__common_audio",
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_crypto__options",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_logging__rtc_event_audio",
-        "webrtc_logging__rtc_stream_config",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_pacing__pacing",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__audio_format_to_string",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__race_checker",
-        "webrtc_rtc_base__rate_limiter",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_task_utils__repeating_task",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_utility__audio_frame_operations",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -2802,27 +809,10 @@ cc_library_static {
     name: "webrtc_audio__audio_frame_api",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "api/audio/audio_frame.cc",
         "api/audio/channel_layout.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__rtp_packet_info",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -2832,31 +822,12 @@ cc_library_static {
     name: "webrtc_audio_codecs__audio_codecs_api",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "api/audio_codecs/audio_codec_pair_id.cc",
         "api/audio_codecs/audio_decoder.cc",
         "api/audio_codecs/audio_encoder.cc",
         "api/audio_codecs/audio_format.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -2865,49 +836,12 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_codecs__builtin_audio_decoder_factory",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "api/audio_codecs/builtin_audio_decoder_factory.cc",
-    ],
+    srcs: ["api/audio_codecs/builtin_audio_decoder_factory.cc"],
     host_supported: true,
     cflags: [
         "-DWEBRTC_USE_BUILTIN_ILBC=1",
         "-DWEBRTC_USE_BUILTIN_OPUS=1",
     ],
-    static_libs: [
-        "webrtc_L16__audio_decoder_L16",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_g711__audio_decoder_g711",
-        "webrtc_g722__audio_decoder_g722",
-        "webrtc_ilbc__audio_decoder_ilbc",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_opus__audio_decoder_multiopus",
-        "webrtc_opus__audio_decoder_opus",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -2916,49 +850,12 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_codecs__builtin_audio_encoder_factory",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "api/audio_codecs/builtin_audio_encoder_factory.cc",
-    ],
+    srcs: ["api/audio_codecs/builtin_audio_encoder_factory.cc"],
     host_supported: true,
     cflags: [
         "-DWEBRTC_USE_BUILTIN_ILBC=1",
         "-DWEBRTC_USE_BUILTIN_OPUS=1",
     ],
-    static_libs: [
-        "webrtc_L16__audio_encoder_L16",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_g711__audio_encoder_g711",
-        "webrtc_g722__audio_encoder_g722",
-        "webrtc_ilbc__audio_encoder_ilbc",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_opus__audio_encoder_multiopus",
-        "webrtc_opus__audio_encoder_opus",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -2968,19 +865,6 @@ cc_library_static {
     name: "webrtc_audio_coding__audio_coding",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_audio_coding__default_neteq_factory",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_neteq__default_neteq_controller_factory",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_neteq__tick_timer",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_coding/acm2/acm_receiver.cc",
         "modules/audio_coding/acm2/acm_remixing.cc",
         "modules/audio_coding/acm2/acm_resampler.cc",
@@ -2988,34 +872,6 @@ cc_library_static {
         "modules/audio_coding/acm2/call_statistics.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__neteq",
-        "webrtc_common_audio__common_audio",
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__audio_format_to_string",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -3024,30 +880,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_coding__audio_coding_opus_common",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_coding/codecs/opus/audio_coder_opus_common.cc",
-    ],
+    srcs: ["modules/audio_coding/codecs/opus/audio_coder_opus_common.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -3056,39 +890,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_coding__audio_encoder_cng",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_coding/codecs/cng/audio_encoder_cng.cc",
-    ],
+    srcs: ["modules/audio_coding/codecs/cng/audio_encoder_cng.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__webrtc_cng",
-        "webrtc_common_audio__common_audio",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -3098,17 +901,6 @@ cc_library_static {
     name: "webrtc_audio_coding__audio_network_adaptor",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc",
         "modules/audio_coding/audio_network_adaptor/bitrate_controller.cc",
         "modules/audio_coding/audio_network_adaptor/channel_controller.cc",
@@ -3122,32 +914,6 @@ cc_library_static {
         "modules/audio_coding/audio_network_adaptor/frame_length_controller_v2.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__audio_network_adaptor_config",
-        "webrtc_common_audio__common_audio",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_logging__rtc_event_audio",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -3156,21 +922,18 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_coding__audio_network_adaptor_config",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_coding/audio_network_adaptor/audio_network_adaptor_config.cc",
-    ],
+    srcs: ["modules/audio_coding/audio_network_adaptor/audio_network_adaptor_config.cc"],
     host_supported: true,
 }
 
 /* From target:
 //modules/audio_coding:default_neteq_factory
 */
-filegroup {
+cc_library_static {
     name: "webrtc_audio_coding__default_neteq_factory",
+    defaults: ["webrtc_defaults"],
     srcs: ["modules/audio_coding/neteq/default_neteq_factory.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -3180,31 +943,10 @@ cc_library_static {
     name: "webrtc_audio_coding__g711",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_coding/codecs/g711/audio_decoder_pcm.cc",
         "modules/audio_coding/codecs/g711/audio_encoder_pcm.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__g711_c",
-        "webrtc_audio_coding__legacy_encoded_audio_frame",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -3215,7 +957,6 @@ cc_library_static {
     defaults: ["webrtc_defaults"],
     srcs: ["modules/audio_coding/codecs/g711/g711_interface.c"],
     host_supported: true,
-    static_libs: ["webrtc_g711__g711_3p"],
 }
 
 /* From target:
@@ -3225,31 +966,10 @@ cc_library_static {
     name: "webrtc_audio_coding__g722",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_coding/codecs/g722/audio_decoder_g722.cc",
         "modules/audio_coding/codecs/g722/audio_encoder_g722.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__g722_c",
-        "webrtc_audio_coding__legacy_encoded_audio_frame",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -3260,7 +980,6 @@ cc_library_static {
     defaults: ["webrtc_defaults"],
     srcs: ["modules/audio_coding/codecs/g722/g722_interface.c"],
     host_supported: true,
-    static_libs: ["webrtc_g722__g722_3p"],
 }
 
 /* From target:
@@ -3270,41 +989,10 @@ cc_library_static {
     name: "webrtc_audio_coding__ilbc",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc",
         "modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__ilbc_c",
-        "webrtc_audio_coding__legacy_encoded_audio_frame",
-        "webrtc_common_audio__common_audio",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -3314,15 +1002,6 @@ cc_library_static {
     name: "webrtc_audio_coding__ilbc_c",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_coding/codecs/ilbc/abs_quant.c",
         "modules/audio_coding/codecs/ilbc/abs_quant_loop.c",
         "modules/audio_coding/codecs/ilbc/augmented_cb_corr.c",
@@ -3394,26 +1073,6 @@ cc_library_static {
         "modules/audio_coding/codecs/ilbc/xcorr_coef.c",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_common_audio__common_audio",
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -3429,7 +1088,6 @@ cc_library_static {
         "modules/audio_coding/codecs/isac/main/source/pitch_filter.c",
     ],
     host_supported: true,
-    static_libs: ["webrtc_fft__fft"],
 }
 
 /* From target:
@@ -3438,29 +1096,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_coding__legacy_encoded_audio_frame",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_coding/codecs/legacy_encoded_audio_frame.cc",
-    ],
+    srcs: ["modules/audio_coding/codecs/legacy_encoded_audio_frame.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -3470,17 +1107,6 @@ cc_library_static {
     name: "webrtc_audio_coding__neteq",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_neteq__tick_timer",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_coding/neteq/accelerate.cc",
         "modules/audio_coding/neteq/audio_multi_vector.cc",
         "modules/audio_coding/neteq/audio_vector.cc",
@@ -3516,37 +1142,6 @@ cc_library_static {
         "modules/audio_coding/neteq/underrun_optimizer.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__webrtc_cng",
-        "webrtc_common_audio__common_audio",
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__audio_format_to_string",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -3556,33 +1151,11 @@ cc_library_static {
     name: "webrtc_audio_coding__pcm16b",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc",
         "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc",
         "modules/audio_coding/codecs/pcm16b/pcm16b_common.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__g711",
-        "webrtc_audio_coding__legacy_encoded_audio_frame",
-        "webrtc_audio_coding__pcm16b_c",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -3601,39 +1174,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_coding__red",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_coding/codecs/red/audio_encoder_copy_red.cc",
-    ],
+    srcs: ["modules/audio_coding/codecs/red/audio_encoder_copy_red.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_common_audio__common_audio",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -3642,32 +1184,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_coding__webrtc_cng",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_coding/codecs/cng/webrtc_cng.cc",
-    ],
+    srcs: ["modules/audio_coding/codecs/cng/webrtc_cng.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__yield",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -3677,15 +1195,6 @@ cc_library_static {
     name: "webrtc_audio_coding__webrtc_multiopus",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_coding/codecs/opus/audio_decoder_multi_channel_opus_impl.cc",
         "modules/audio_coding/codecs/opus/audio_encoder_multi_channel_opus_impl.cc",
     ],
@@ -3695,22 +1204,6 @@ cc_library_static {
         "-DWEBRTC_CODEC_OPUS",
         "-DWEBRTC_OPUS_SUPPORT_120MS_PTIME=1",
     ],
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__audio_coding_opus_common",
-        "webrtc_audio_coding__webrtc_opus_wrapper",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_opus__audio_encoder_opus_config",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -3720,17 +1213,6 @@ cc_library_static {
     name: "webrtc_audio_coding__webrtc_opus",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/audio_coding/codecs/opus/audio_decoder_opus.cc",
         "modules/audio_coding/codecs/opus/audio_encoder_opus.cc",
     ],
@@ -3740,34 +1222,6 @@ cc_library_static {
         "-DWEBRTC_CODEC_OPUS",
         "-DWEBRTC_OPUS_SUPPORT_120MS_PTIME=1",
     ],
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__audio_coding_opus_common",
-        "webrtc_audio_coding__audio_network_adaptor",
-        "webrtc_audio_coding__webrtc_opus_wrapper",
-        "webrtc_common_audio__common_audio",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_opus__audio_encoder_opus_config",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -3776,31 +1230,13 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_coding__webrtc_opus_wrapper",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_coding/codecs/opus/opus_interface.cc",
-    ],
+    srcs: ["modules/audio_coding/codecs/opus/opus_interface.cc"],
     host_supported: true,
     cflags: [
         "-DWEBRTC_CODEC_ILBC",
         "-DWEBRTC_CODEC_OPUS",
         "-DWEBRTC_OPUS_SUPPORT_120MS_PTIME=1",
     ],
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-    ],
 }
 
 /* From target:
@@ -3810,42 +1246,10 @@ cc_library_static {
     name: "webrtc_audio_device__audio_device_buffer",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_device/audio_device_buffer.cc",
         "modules/audio_device/fine_audio_buffer.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__timestamp_aligner",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__task_queue",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -3854,36 +1258,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_device__audio_device_generic",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_device/audio_device_generic.cc",
-    ],
+    srcs: ["modules/audio_device/audio_device_generic.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_device__audio_device_buffer",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -3893,16 +1269,6 @@ cc_library_static {
     name: "webrtc_audio_device__audio_device_impl",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_utility__utility",
         "modules/audio_device/audio_device_data_observer.cc",
         "modules/audio_device/audio_device_impl.cc",
         "modules/audio_device/dummy/audio_device_dummy.cc",
@@ -3912,38 +1278,6 @@ cc_library_static {
     ],
     host_supported: true,
     cflags: ["-DWEBRTC_DUMMY_FILE_DEVICES"],
-    static_libs: [
-        "webrtc_audio_device__audio_device_buffer",
-        "webrtc_audio_device__audio_device_generic",
-        "webrtc_common_audio__common_audio",
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__random",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_task_utils__repeating_task",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -3952,34 +1286,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_mixer__audio_frame_manipulator",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_mixer/audio_frame_manipulator.cc",
-    ],
+    srcs: ["modules/audio_mixer/audio_frame_manipulator.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio__audio_frame_api",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_utility__audio_frame_operations",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -3989,54 +1297,21 @@ cc_library_static {
     name: "webrtc_audio_mixer__audio_mixer_impl",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_mixer/audio_mixer_impl.cc",
         "modules/audio_mixer/default_output_rate_calculator.cc",
         "modules/audio_mixer/frame_combiner.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__fixed_digital",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_mixer__audio_frame_manipulator",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_common_audio__common_audio",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__race_checker",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_utility__audio_frame_operations",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
 //modules/audio_processing:aec_dump_interface
 */
-filegroup {
+cc_library_static {
     name: "webrtc_audio_processing__aec_dump_interface",
+    defaults: ["webrtc_defaults"],
     srcs: ["modules/audio_processing/include/aec_dump.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -4045,29 +1320,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_audio_processing__api",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/include/audio_processing.cc",
-    ],
+    srcs: ["modules/audio_processing/include/audio_processing.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio__aec3_config",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_processing__audio_processing_statistics",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-    ],
 }
 
 /* From target:
@@ -4076,34 +1330,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_processing__apm_logging",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/logging/apm_data_dumper.cc",
-    ],
+    srcs: ["modules/audio_processing/logging/apm_data_dumper.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_common_audio__common_audio",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -4113,36 +1341,11 @@ cc_library_static {
     name: "webrtc_audio_processing__audio_buffer",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/audio_buffer.cc",
         "modules/audio_processing/splitting_filter.cc",
         "modules/audio_processing/three_band_filter_bank.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_processing__api",
-        "webrtc_common_audio__common_audio",
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -4151,26 +1354,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_processing__audio_frame_proxies",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/include/audio_frame_proxies.cc",
-    ],
+    srcs: ["modules/audio_processing/include/audio_frame_proxies.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_processing__api",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -4180,78 +1365,12 @@ cc_library_static {
     name: "webrtc_audio_processing__audio_processing",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/audio_processing_builder_impl.cc",
         "modules/audio_processing/audio_processing_impl.cc",
         "modules/audio_processing/echo_control_mobile_impl.cc",
         "modules/audio_processing/gain_control_impl.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_aec3__aec3",
-        "webrtc_aec_dump__null_aec_dump_factory",
-        "webrtc_aecm__aecm_core",
-        "webrtc_agc2__cpu_features",
-        "webrtc_agc2__input_volume_stats_reporter",
-        "webrtc_agc__agc",
-        "webrtc_agc__legacy_agc",
-        "webrtc_audio__aec3_config",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_audio_processing__audio_buffer",
-        "webrtc_audio_processing__audio_frame_proxies",
-        "webrtc_audio_processing__audio_processing_statistics",
-        "webrtc_audio_processing__gain_controller2",
-        "webrtc_audio_processing__high_pass_filter",
-        "webrtc_audio_processing__optionally_built_submodule_creators",
-        "webrtc_capture_levels_adjuster__capture_levels_adjuster",
-        "webrtc_common_audio__common_audio",
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_common_audio__fir_filter_factory",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ns__ns",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_ooura__fft_size_256",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__denormal_disabler",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_utility__audio_frame_operations",
-        "webrtc_vad__vad",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -4260,12 +1379,7 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_processing__audio_processing_statistics",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/include/audio_processing_statistics.cc",
-    ],
+    srcs: ["modules/audio_processing/include/audio_processing_statistics.cc"],
     host_supported: true,
 }
 
@@ -4275,53 +1389,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_processing__gain_controller2",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/gain_controller2.cc",
-    ],
+    srcs: ["modules/audio_processing/gain_controller2.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__adaptive_digital",
-        "webrtc_agc2__cpu_features",
-        "webrtc_agc2__fixed_digital",
-        "webrtc_agc2__gain_applier",
-        "webrtc_agc2__input_volume_controller",
-        "webrtc_agc2__vad_wrapper",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_audio_processing__audio_buffer",
-        "webrtc_common_audio__common_audio",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -4330,34 +1399,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_processing__high_pass_filter",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/high_pass_filter.cc",
-    ],
+    srcs: ["modules/audio_processing/high_pass_filter.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_processing__audio_buffer",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_utility__cascaded_biquad_filter",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -4366,41 +1409,18 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_audio_processing__optionally_built_submodule_creators",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/optionally_built_submodule_creators.cc",
-    ],
+    srcs: ["modules/audio_processing/optionally_built_submodule_creators.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_transient__transient_suppressor_impl",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
 //modules/audio_processing:rms_level
 */
-filegroup {
+cc_library_static {
     name: "webrtc_audio_processing__rms_level",
+    defaults: ["webrtc_defaults"],
     srcs: ["modules/audio_processing/rms_level.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -4409,34 +1429,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_av1__av1_svc_config",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "modules/video_coding/codecs/av1/av1_svc_config.cc",
-    ],
+    srcs: ["modules/video_coding/codecs/av1/av1_svc_config.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
 }
 
 /* From target:
@@ -4445,26 +1439,16 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_base64__base64",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "rtc_base/third_party/base64/base64.cc",
-    ],
+    srcs: ["rtc_base/third_party/base64/base64.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/base:base
 */
-filegroup {
+cc_library_static {
     name: "webrtc_base__base",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "third_party/abseil-cpp/absl/base/internal/cycleclock.cc",
         "third_party/abseil-cpp/absl/base/internal/spinlock.cc",
@@ -4472,46 +1456,135 @@ filegroup {
         "third_party/abseil-cpp/absl/base/internal/thread_identity.cc",
         "third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc",
     ],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/base:log_severity
 */
-filegroup {
+cc_library_static {
     name: "webrtc_base__log_severity",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/base/log_severity.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/base:malloc_internal
 */
-filegroup {
+cc_library_static {
     name: "webrtc_base__malloc_internal",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/base:raw_logging_internal
 */
-filegroup {
+cc_library_static {
     name: "webrtc_base__raw_logging_internal",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/base/internal/raw_logging.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/base:spinlock_wait
 */
-filegroup {
+cc_library_static {
     name: "webrtc_base__spinlock_wait",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/base:throw_delegate
 */
-filegroup {
+cc_library_static {
     name: "webrtc_base__throw_delegate",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/base/internal/throw_delegate.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
@@ -4520,33 +1593,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_call__bitrate_allocator",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "call/bitrate_allocator.cc",
-    ],
+    srcs: ["call/bitrate_allocator.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -4555,123 +1603,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_call__bitrate_configurator",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "call/rtp_bitrate_configurator.cc",
-    ],
+    srcs: ["call/rtp_bitrate_configurator.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_transport__bitrate_settings",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -4681,61 +1614,6 @@ cc_library_static {
     name: "webrtc_call__call",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_coding__default_neteq_factory",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__default_neteq_controller_factory",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_neteq__tick_timer",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_svc__svc_rate_allocator",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        ":webrtc_video_coding__webrtc_vp8_scalability",
         "call/call.cc",
         "call/call_factory.cc",
         "call/degraded_call.cc",
@@ -4743,106 +1621,6 @@ cc_library_static {
         "call/receive_time_calculator.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_adaptation__resource_adaptation",
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_api__transport_api",
-        "webrtc_audio__audio",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__neteq",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__bitrate_allocator",
-        "webrtc_call__call_interfaces",
-        "webrtc_call__fake_network",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_call__rtp_receiver",
-        "webrtc_call__rtp_sender",
-        "webrtc_call__simulated_network",
-        "webrtc_call__version",
-        "webrtc_call__video_stream_api",
-        "webrtc_config__encoder_config",
-        "webrtc_congestion_controller__congestion_controller",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_experiments__stable_target_rate_experiment",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_logging__rtc_event_audio",
-        "webrtc_logging__rtc_event_rtp_rtcp",
-        "webrtc_logging__rtc_event_video",
-        "webrtc_logging__rtc_stream_config",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_network__sent_packet",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_pacing__pacing",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__random",
-        "webrtc_rtc_base__rate_limiter",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_task_utils__repeating_task",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__decode_synchronizer",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__frame_decode_timing",
-        "webrtc_video__video",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_coding",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -4852,52 +1630,6 @@ cc_library_static {
     name: "webrtc_call__call_interfaces",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "call/audio_receive_stream.cc",
         "call/audio_send_stream.cc",
         "call/audio_state.cc",
@@ -4906,78 +1638,6 @@ cc_library_static {
         "call/syncable.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_api__transport_api",
-        "webrtc_async_audio_processing__async_audio_processing",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_audio_processing__audio_processing",
-        "webrtc_audio_processing__audio_processing_statistics",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_call__video_stream_api",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_crypto__options",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_network__sent_packet",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__audio_format_to_string",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_transport__bitrate_settings",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -4986,119 +1646,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_call__fake_network",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "call/fake_network_pipe.cc",
-    ],
+    srcs: ["call/fake_network_pipe.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__transport_api",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__call_interfaces",
-        "webrtc_call__simulated_network",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__random",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -5107,74 +1656,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_call__rtp_interfaces",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "call/rtp_config.cc",
-    ],
+    srcs: ["call/rtp_config.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_parameters",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_crypto__options",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_transport__bitrate_settings",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-    ],
 }
 
 /* From target:
@@ -5184,123 +1667,11 @@ cc_library_static {
     name: "webrtc_call__rtp_receiver",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "call/rtp_demuxer.cc",
         "call/rtp_stream_receiver_controller.cc",
         "call/rtx_receive_stream.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -5310,143 +1681,11 @@ cc_library_static {
     name: "webrtc_call__rtp_sender",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "call/rtp_payload_params.cc",
         "call/rtp_transport_controller_send.cc",
         "call/rtp_video_sender.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__transport_api",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__bitrate_configurator",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_congestion_controller__congestion_controller",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_logging__rtc_event_bwe",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_pacing__pacing",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__race_checker",
-        "webrtc_rtc_base__random",
-        "webrtc_rtc_base__rate_limiter",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp__control_handler",
-        "webrtc_rtp__transport_feedback",
-        "webrtc_rtp_rtcp__rtp_rtcp",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_rtp_rtcp__rtp_video_header",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_task_utils__repeating_task",
-        "webrtc_transport__field_trial_based_config",
-        "webrtc_transport__goog_cc",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__chain_diff_calculator",
-        "webrtc_video_coding__frame_dependencies_calculator",
-        "webrtc_video_coding__video_codec_interface",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -5455,62 +1694,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_call__simulated_network",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        "call/simulated_network.cc",
-    ],
+    srcs: ["call/simulated_network.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__race_checker",
-        "webrtc_rtc_base__random",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__data_size",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -5530,90 +1715,10 @@ cc_library_static {
     name: "webrtc_call__video_stream_api",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "call/video_receive_stream.cc",
         "call/video_send_stream.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_api__transport_api",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_common_video__common_video",
-        "webrtc_config__encoder_config",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_crypto__options",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
 }
 
 /* From target:
@@ -5623,48 +1728,41 @@ cc_library_static {
     name: "webrtc_capture_levels_adjuster__capture_levels_adjuster",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/capture_levels_adjuster/audio_samples_scaler.cc",
         "modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_processing__audio_buffer",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/time/internal/cctz:civil_time
 */
-filegroup {
+cc_library_static {
     name: "webrtc_cctz__civil_time",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/time/internal/cctz/src/civil_time_detail.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/time/internal/cctz:time_zone
 */
-filegroup {
+cc_library_static {
     name: "webrtc_cctz__time_zone",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_fixed.cc",
         "third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc",
@@ -5676,6 +1774,20 @@ filegroup {
         "third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_posix.cc",
         "third_party/abseil-cpp/absl/time/internal/cctz/src/zone_info_source.cc",
     ],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
@@ -5685,15 +1797,6 @@ cc_library_static {
     name: "webrtc_common_audio__common_audio",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "common_audio/audio_converter.cc",
         "common_audio/audio_util.cc",
         "common_audio/channel_buffer.cc",
@@ -5710,38 +1813,14 @@ cc_library_static {
         "common_audio/window_generator.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_256",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
     arch: {
         arm: {
-            static_libs: ["webrtc_common_audio__common_audio_neon"],
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
         },
         arm64: {
-            static_libs: ["webrtc_common_audio__common_audio_neon"],
         },
         x86_64: {
-            static_libs: [
-                "webrtc_common_audio__common_audio_avx2",
-                "webrtc_common_audio__common_audio_sse2",
-            ],
         },
         x86: {
-            static_libs: [
-                "webrtc_common_audio__common_audio_avx2",
-                "webrtc_common_audio__common_audio_sse2",
-            ],
         },
     },
 }
@@ -5753,27 +1832,10 @@ cc_library_static {
     name: "webrtc_common_audio__common_audio_avx2",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "common_audio/fir_filter_avx2.cc",
         "common_audio/resampler/sinc_resampler_avx2.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
     arch: {
         arm: {
             enabled: false,
@@ -5794,15 +1856,6 @@ cc_library_static {
     name: "webrtc_common_audio__common_audio_c",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "common_audio/ring_buffer.c",
         "common_audio/signal_processing/auto_corr_to_refl_coef.c",
         "common_audio/signal_processing/auto_correlation.c",
@@ -5841,19 +1894,8 @@ cc_library_static {
         "common_audio/vad/webrtc_vad.c",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_common_audio__common_audio_cc",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_ooura__fft_size_256",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_spl_sqrt_floor__spl_sqrt_floor",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
     arch: {
         arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
         },
         arm64: {
             srcs: [
@@ -5885,12 +1927,28 @@ cc_library_static {
 /* From target:
 //common_audio:common_audio_c_arm_asm
 */
-filegroup {
+cc_library_static {
     name: "webrtc_common_audio__common_audio_c_arm_asm",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "common_audio/signal_processing/complex_bit_reverse_arm.S",
         "common_audio/signal_processing/filter_ar_fast_q12_armv7.S",
     ],
+    host_supported: true,
+    arch: {
+        arm64: {
+            enabled: false,
+        },
+        riscv64: {
+            enabled: false,
+        },
+        x86_64: {
+            enabled: false,
+        },
+        x86: {
+            enabled: false,
+        },
+    },
 }
 
 /* From target:
@@ -5899,26 +1957,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_common_audio__common_audio_cc",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "common_audio/signal_processing/dot_product_with_scale.cc",
-    ],
+    srcs: ["common_audio/signal_processing/dot_product_with_scale.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
 }
 
 /* From target:
@@ -5928,32 +1968,11 @@ cc_library_static {
     name: "webrtc_common_audio__common_audio_neon",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "common_audio/fir_filter_neon.cc",
         "common_audio/resampler/sinc_resampler_neon.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_common_audio__common_audio_neon_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
     arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
         riscv64: {
             enabled: false,
         },
@@ -5973,31 +1992,12 @@ cc_library_static {
     name: "webrtc_common_audio__common_audio_neon_c",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "common_audio/signal_processing/cross_correlation_neon.c",
         "common_audio/signal_processing/downsample_fast_neon.c",
         "common_audio/signal_processing/min_max_operations_neon.c",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-    ],
     arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
         riscv64: {
             enabled: false,
         },
@@ -6017,27 +2017,10 @@ cc_library_static {
     name: "webrtc_common_audio__common_audio_sse2",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "common_audio/fir_filter_sse.cc",
         "common_audio/resampler/sinc_resampler_sse.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
     arch: {
         arm: {
             enabled: false,
@@ -6058,46 +2041,18 @@ cc_library_static {
     name: "webrtc_common_audio__fir_filter_factory",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "common_audio/fir_filter_c.cc",
         "common_audio/fir_filter_factory.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
     arch: {
         arm: {
-            static_libs: ["webrtc_common_audio__common_audio_neon"],
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
         },
         arm64: {
-            static_libs: ["webrtc_common_audio__common_audio_neon"],
         },
         x86_64: {
-            static_libs: [
-                "webrtc_common_audio__common_audio_avx2",
-                "webrtc_common_audio__common_audio_sse2",
-            ],
         },
         x86: {
-            static_libs: [
-                "webrtc_common_audio__common_audio_avx2",
-                "webrtc_common_audio__common_audio_sse2",
-            ],
         },
     },
 }
@@ -6109,43 +2064,6 @@ cc_library_static {
     name: "webrtc_common_video__common_video",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video_codecs__scalability_mode",
         "common_video/bitrate_adjuster.cc",
         "common_video/frame_rate_estimator.cc",
         "common_video/framerate_controller.cc",
@@ -6159,35 +2077,6 @@ cc_library_static {
         "common_video/video_frame_buffer_pool.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__bit_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__race_checker",
-        "webrtc_rtc_base__rate_statistics",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_frame_i010",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
 }
 
 /* From target:
@@ -6196,27 +2085,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_config__encoder_config",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "video/config/video_encoder_config.cc",
-    ],
+    srcs: ["video/config/video_encoder_config.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
 }
 
 /* From target:
@@ -6226,136 +2096,10 @@ cc_library_static {
     name: "webrtc_config__streams_config",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "video/config/encoder_stream_factory.cc",
         "video/config/simulcast.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_adaptation__resource_adaptation",
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_config__encoder_config",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_experiments__min_video_bitrate_experiment",
-        "webrtc_experiments__normalize_simulcast_size_experiment",
-        "webrtc_experiments__rate_control_settings",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_transport__field_trial_based_config",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_coding_utility",
-        "webrtc_video_coding__webrtc_vp9_helpers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -6365,144 +2109,60 @@ cc_library_static {
     name: "webrtc_congestion_controller__congestion_controller",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/congestion_controller/receive_side_congestion_controller.cc",
         "modules/congestion_controller/remb_throttler.cc",
     ],
     host_supported: true,
     cflags: ["-DBWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0"],
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_pacing__pacing",
-        "webrtc_remote_bitrate_estimator__remote_bitrate_estimator",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/container:hashtablez_sampler
 */
-filegroup {
+cc_library_static {
     name: "webrtc_container__hashtablez_sampler",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.cc",
         "third_party/abseil-cpp/absl/container/internal/hashtablez_sampler_force_weak_definition.cc",
     ],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/container:raw_hash_set
 */
-filegroup {
+cc_library_static {
     name: "webrtc_container__raw_hash_set",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/container/internal/raw_hash_set.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
@@ -6511,46 +2171,161 @@ filegroup {
 cc_library_static {
     name: "webrtc_containers__flat_containers_internal",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "rtc_base/containers/flat_tree.cc",
-    ],
+    srcs: ["rtc_base/containers/flat_tree.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
 //third_party/crc32c:crc32c
 */
-filegroup {
+cc_library_static {
     name: "webrtc_crc32c__crc32c",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "third_party/crc32c/src/src/crc32c.cc",
         "third_party/crc32c/src/src/crc32c_portable.cc",
     ],
+    host_supported: true,
+    cflags: [
+        "-DBYTE_ORDER_BIG_ENDIAN=0",
+        "-DCRC32C_TESTS_BUILT_WITH_GLOG=0",
+        "-DHAVE_BUILTIN_PREFETCH=1",
+        "-DHAVE_STRONG_GETAUXVAL=1",
+        "-DHAVE_WEAK_GETAUXVAL=1",
+    ],
+    arch: {
+        arm: {
+            cflags: [
+                "-DHAVE_MM_PREFETCH=0",
+                "-DHAVE_SSE42=0",
+            ],
+        },
+        arm64: {
+            cflags: [
+                "-DHAVE_MM_PREFETCH=0",
+                "-DHAVE_SSE42=0",
+            ],
+        },
+        riscv64: {
+            cflags: [
+                "-DHAVE_MM_PREFETCH=0",
+                "-DHAVE_SSE42=0",
+            ],
+        },
+        x86_64: {
+            cflags: [
+                "-DHAVE_MM_PREFETCH=1",
+                "-DHAVE_SSE42=1",
+            ],
+        },
+        x86: {
+            cflags: [
+                "-DHAVE_MM_PREFETCH=1",
+                "-DHAVE_SSE42=1",
+            ],
+        },
+    },
 }
 
 /* From target:
 //third_party/crc32c:crc32c_arm64
 */
-filegroup {
+cc_library_static {
     name: "webrtc_crc32c__crc32c_arm64",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/crc32c/src/src/crc32c_arm64.cc"],
+    host_supported: true,
+    cflags: [
+        "-DBYTE_ORDER_BIG_ENDIAN=0",
+        "-DCRC32C_TESTS_BUILT_WITH_GLOG=0",
+        "-DHAVE_BUILTIN_PREFETCH=1",
+        "-DHAVE_STRONG_GETAUXVAL=1",
+        "-DHAVE_WEAK_GETAUXVAL=1",
+    ],
+    arch: {
+        arm: {
+            cflags: [
+                "-DHAVE_MM_PREFETCH=0",
+                "-DHAVE_SSE42=0",
+            ],
+        },
+        arm64: {
+            cflags: [
+                "-DHAVE_MM_PREFETCH=0",
+                "-DHAVE_SSE42=0",
+                "-march=armv8-a",
+            ],
+        },
+        riscv64: {
+            cflags: [
+                "-DHAVE_MM_PREFETCH=0",
+                "-DHAVE_SSE42=0",
+            ],
+        },
+        x86_64: {
+            cflags: [
+                "-DHAVE_MM_PREFETCH=1",
+                "-DHAVE_SSE42=1",
+            ],
+        },
+        x86: {
+            cflags: [
+                "-DHAVE_MM_PREFETCH=1",
+                "-DHAVE_SSE42=1",
+            ],
+        },
+    },
 }
 
 /* From target:
 //third_party/crc32c:crc32c_sse42
 */
-filegroup {
+cc_library_static {
     name: "webrtc_crc32c__crc32c_sse42",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/crc32c/src/src/crc32c_sse42.cc"],
+    host_supported: true,
+    cflags: [
+        "-DBYTE_ORDER_BIG_ENDIAN=0",
+        "-DCRC32C_TESTS_BUILT_WITH_GLOG=0",
+        "-DHAVE_BUILTIN_PREFETCH=1",
+        "-DHAVE_STRONG_GETAUXVAL=1",
+        "-DHAVE_WEAK_GETAUXVAL=1",
+    ],
+    arch: {
+        arm: {
+            cflags: [
+                "-DHAVE_MM_PREFETCH=0",
+                "-DHAVE_SSE42=0",
+            ],
+        },
+        arm64: {
+            cflags: [
+                "-DHAVE_MM_PREFETCH=0",
+                "-DHAVE_SSE42=0",
+            ],
+        },
+        riscv64: {
+            cflags: [
+                "-DHAVE_MM_PREFETCH=0",
+                "-DHAVE_SSE42=0",
+            ],
+        },
+        x86_64: {
+            cflags: [
+                "-DHAVE_MM_PREFETCH=1",
+                "-DHAVE_SSE42=1",
+                "-msse4.2",
+            ],
+        },
+        x86: {
+            cflags: [
+                "-DHAVE_MM_PREFETCH=1",
+                "-DHAVE_SSE42=1",
+                "-msse4.2",
+            ],
+        },
+    },
 }
 
 /* From target:
@@ -6559,93 +2334,104 @@ filegroup {
 cc_library_static {
     name: "webrtc_crypto__options",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        "api/crypto/crypto_options.cc",
-    ],
+    srcs: ["api/crypto/crypto_options.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/debugging:debugging_internal
 */
-filegroup {
+cc_library_static {
     name: "webrtc_debugging__debugging_internal",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc",
         "third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc",
         "third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc",
     ],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/debugging:demangle_internal
 */
-filegroup {
+cc_library_static {
     name: "webrtc_debugging__demangle_internal",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/debugging/internal/demangle.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/debugging:stacktrace
 */
-filegroup {
+cc_library_static {
     name: "webrtc_debugging__stacktrace",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/debugging/stacktrace.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/debugging:symbolize
 */
-filegroup {
+cc_library_static {
     name: "webrtc_debugging__symbolize",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/debugging/symbolize.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
@@ -6654,28 +2440,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_experiments__alr_experiment",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/experiments/alr_experiment.cc",
-    ],
+    srcs: ["rtc_base/experiments/alr_experiment.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_transport__field_trial_based_config",
-    ],
 }
 
 /* From target:
@@ -6684,30 +2450,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_experiments__balanced_degradation_settings",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "rtc_base/experiments/balanced_degradation_settings.cc",
-    ],
+    srcs: ["rtc_base/experiments/balanced_degradation_settings.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
 }
 
 /* From target:
@@ -6716,30 +2460,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_experiments__bandwidth_quality_scaler_settings",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/experiments/bandwidth_quality_scaler_settings.cc",
-    ],
+    srcs: ["rtc_base/experiments/bandwidth_quality_scaler_settings.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_transport__field_trial_based_config",
-    ],
 }
 
 /* From target:
@@ -6748,28 +2470,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_experiments__cpu_speed_experiment",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/experiments/cpu_speed_experiment.cc",
-    ],
+    srcs: ["rtc_base/experiments/cpu_speed_experiment.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-    ],
 }
 
 /* From target:
@@ -6778,30 +2480,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_experiments__encoder_info_settings",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "rtc_base/experiments/encoder_info_settings.cc",
-    ],
+    srcs: ["rtc_base/experiments/encoder_info_settings.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
 }
 
 /* From target:
@@ -6811,31 +2491,12 @@ cc_library_static {
     name: "webrtc_experiments__field_trial_parser",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "rtc_base/experiments/field_trial_list.cc",
         "rtc_base/experiments/field_trial_parser.cc",
         "rtc_base/experiments/field_trial_units.cc",
         "rtc_base/experiments/struct_parameters_parser.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__data_size",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -6844,28 +2505,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_experiments__keyframe_interval_settings_experiment",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/experiments/keyframe_interval_settings.cc",
-    ],
+    srcs: ["rtc_base/experiments/keyframe_interval_settings.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_transport__field_trial_based_config",
-    ],
 }
 
 /* From target:
@@ -6874,30 +2515,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_experiments__min_video_bitrate_experiment",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/experiments/min_video_bitrate_experiment.cc",
-    ],
+    srcs: ["rtc_base/experiments/min_video_bitrate_experiment.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_units__data_rate",
-        "webrtc_video__video_frame",
-    ],
 }
 
 /* From target:
@@ -6906,27 +2525,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_experiments__normalize_simulcast_size_experiment",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/experiments/normalize_simulcast_size_experiment.cc",
-    ],
+    srcs: ["rtc_base/experiments/normalize_simulcast_size_experiment.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-    ],
 }
 
 /* From target:
@@ -6935,30 +2535,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_experiments__quality_rampup_experiment",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/experiments/quality_rampup_experiment.cc",
-    ],
+    srcs: ["rtc_base/experiments/quality_rampup_experiment.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_transport__field_trial_based_config",
-    ],
 }
 
 /* From target:
@@ -6967,30 +2545,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_experiments__quality_scaler_settings",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/experiments/quality_scaler_settings.cc",
-    ],
+    srcs: ["rtc_base/experiments/quality_scaler_settings.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_transport__field_trial_based_config",
-    ],
 }
 
 /* From target:
@@ -6999,29 +2555,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_experiments__quality_scaling_experiment",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "rtc_base/experiments/quality_scaling_experiment.cc",
-    ],
+    srcs: ["rtc_base/experiments/quality_scaling_experiment.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
 }
 
 /* From target:
@@ -7030,34 +2565,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_experiments__rate_control_settings",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "rtc_base/experiments/rate_control_settings.cc",
-    ],
+    srcs: ["rtc_base/experiments/rate_control_settings.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_config__encoder_config",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_transport__field_trial_based_config",
-        "webrtc_units__data_size",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
 }
 
 /* From target:
@@ -7066,27 +2575,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_experiments__rtt_mult_experiment",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/experiments/rtt_mult_experiment.cc",
-    ],
+    srcs: ["rtc_base/experiments/rtt_mult_experiment.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-    ],
 }
 
 /* From target:
@@ -7095,28 +2585,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_experiments__stable_target_rate_experiment",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/experiments/stable_target_rate_experiment.cc",
-    ],
+    srcs: ["rtc_base/experiments/stable_target_rate_experiment.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_transport__field_trial_based_config",
-    ],
 }
 
 /* From target:
@@ -7135,30 +2605,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_g711__audio_decoder_g711",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/audio_codecs/g711/audio_decoder_g711.cc",
-    ],
+    srcs: ["api/audio_codecs/g711/audio_decoder_g711.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__g711",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -7167,31 +2615,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_g711__audio_encoder_g711",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/audio_codecs/g711/audio_encoder_g711.cc",
-    ],
+    srcs: ["api/audio_codecs/g711/audio_encoder_g711.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__g711",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -7210,30 +2635,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_g722__audio_decoder_g722",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/audio_codecs/g722/audio_decoder_g722.cc",
-    ],
+    srcs: ["api/audio_codecs/g722/audio_decoder_g722.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__g722",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -7242,31 +2645,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_g722__audio_encoder_g722",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/audio_codecs/g722/audio_encoder_g722.cc",
-    ],
+    srcs: ["api/audio_codecs/g722/audio_encoder_g722.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__g722",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -7288,21 +2668,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_generic_frame_descriptor__generic_frame_descriptor",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "common_video/generic_frame_descriptor/generic_frame_info.cc",
-    ],
+    srcs: ["common_video/generic_frame_descriptor/generic_frame_info.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -7311,34 +2678,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_goog_cc__alr_detector",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/congestion_controller/goog_cc/alr_detector.cc",
-    ],
+    srcs: ["modules/congestion_controller/goog_cc/alr_detector.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__alr_experiment",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_logging__rtc_event_pacing",
-        "webrtc_pacing__interval_budget",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_synchronization__yield",
-        "webrtc_transport__field_trial_based_config",
-    ],
 }
 
 /* From target:
@@ -7348,129 +2689,11 @@ cc_library_static {
     name: "webrtc_goog_cc__delay_based_bwe",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/congestion_controller/goog_cc/delay_based_bwe.cc",
         "modules/congestion_controller/goog_cc/inter_arrival_delta.cc",
     ],
     host_supported: true,
     cflags: ["-DBWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0"],
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_goog_cc__estimators",
-        "webrtc_logging__rtc_event_bwe",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_pacing__pacing",
-        "webrtc_remote_bitrate_estimator__remote_bitrate_estimator",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__race_checker",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -7480,44 +2703,6 @@ cc_library_static {
     name: "webrtc_goog_cc__estimators",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc",
         "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.cc",
         "modules/congestion_controller/goog_cc/bitrate_estimator.cc",
@@ -7527,27 +2712,6 @@ cc_library_static {
     ],
     host_supported: true,
     cflags: ["-DBWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0"],
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_logging__rtc_event_bwe",
-        "webrtc_remote_bitrate_estimator__remote_bitrate_estimator",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__data_size",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -7556,138 +2720,9 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_goog_cc__goog_cc",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "modules/congestion_controller/goog_cc/goog_cc_network_control.cc",
-    ],
+    srcs: ["modules/congestion_controller/goog_cc/goog_cc_network_control.cc"],
     host_supported: true,
     cflags: ["-DBWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0"],
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__alr_experiment",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_experiments__rate_control_settings",
-        "webrtc_goog_cc__alr_detector",
-        "webrtc_goog_cc__delay_based_bwe",
-        "webrtc_goog_cc__estimators",
-        "webrtc_goog_cc__loss_based_bwe_v2",
-        "webrtc_goog_cc__probe_controller",
-        "webrtc_goog_cc__pushback_controller",
-        "webrtc_goog_cc__send_side_bwe",
-        "webrtc_logging__rtc_event_bwe",
-        "webrtc_logging__rtc_event_pacing",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_remote_bitrate_estimator__remote_bitrate_estimator",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_transport__field_trial_based_config",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__data_size",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -7696,23 +2731,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_goog_cc__link_capacity_estimator",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/congestion_controller/goog_cc/link_capacity_estimator.cc",
-    ],
+    srcs: ["modules/congestion_controller/goog_cc/link_capacity_estimator.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_units__data_rate",
-    ],
 }
 
 /* From target:
@@ -7721,30 +2741,9 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_goog_cc__loss_based_bwe_v1",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.cc",
-    ],
+    srcs: ["modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.cc"],
     host_supported: true,
     cflags: ["-DBWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0"],
-    static_libs: [
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -7753,66 +2752,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_goog_cc__loss_based_bwe_v2",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc",
-    ],
+    srcs: ["modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_remote_bitrate_estimator__remote_bitrate_estimator",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__data_size",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -7821,36 +2762,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_goog_cc__probe_controller",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/congestion_controller/goog_cc/probe_controller.cc",
-    ],
+    srcs: ["modules/congestion_controller/goog_cc/probe_controller.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_logging__rtc_event_bwe",
-        "webrtc_logging__rtc_event_pacing",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__data_size",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -7859,30 +2772,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_goog_cc__pushback_controller",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "modules/congestion_controller/goog_cc/congestion_window_pushback_controller.cc",
-    ],
+    srcs: ["modules/congestion_controller/goog_cc/congestion_window_pushback_controller.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__rate_control_settings",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_size",
-    ],
 }
 
 /* From target:
@@ -7891,96 +2782,78 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_goog_cc__send_side_bwe",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc",
-    ],
+    srcs: ["modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc"],
     host_supported: true,
     cflags: ["-DBWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0"],
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_goog_cc__loss_based_bwe_v1",
-        "webrtc_goog_cc__loss_based_bwe_v2",
-        "webrtc_logging__rtc_event_bwe",
-        "webrtc_remote_bitrate_estimator__remote_bitrate_estimator",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/hash:city
 */
-filegroup {
+cc_library_static {
     name: "webrtc_hash__city",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/hash/internal/city.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/hash:hash
 */
-filegroup {
+cc_library_static {
     name: "webrtc_hash__hash",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/hash/internal/hash.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/hash:low_level_hash
 */
-filegroup {
+cc_library_static {
     name: "webrtc_hash__low_level_hash",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
@@ -7989,38 +2862,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_ilbc__audio_decoder_ilbc",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/audio_codecs/ilbc/audio_decoder_ilbc.cc",
-    ],
+    srcs: ["api/audio_codecs/ilbc/audio_decoder_ilbc.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__ilbc",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -8029,39 +2872,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_ilbc__audio_encoder_ilbc",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/audio_codecs/ilbc/audio_encoder_ilbc.cc",
-    ],
+    srcs: ["api/audio_codecs/ilbc/audio_encoder_ilbc.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__ilbc",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -8071,43 +2883,6 @@ cc_library_static {
     name: "webrtc_logging__ice_log",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
         "logging/rtc_event_log/events/rtc_event_dtls_transport_state.cc",
         "logging/rtc_event_log/events/rtc_event_dtls_writable_state.cc",
         "logging/rtc_event_log/events/rtc_event_ice_candidate_pair.cc",
@@ -8115,27 +2890,6 @@ cc_library_static {
         "logging/rtc_event_log/ice_logger.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__dtls_transport_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_logging__rtc_event_field",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -8145,33 +2899,12 @@ cc_library_static {
     name: "webrtc_logging__rtc_event_audio",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
         "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.cc",
         "logging/rtc_event_log/events/rtc_event_audio_playout.cc",
         "logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.cc",
         "logging/rtc_event_log/events/rtc_event_audio_send_stream_config.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_coding__audio_network_adaptor_config",
-        "webrtc_logging__rtc_event_field",
-        "webrtc_logging__rtc_stream_config",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_synchronization__yield",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -8181,28 +2914,10 @@ cc_library_static {
     name: "webrtc_logging__rtc_event_begin_end",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "logging/rtc_event_log/events/rtc_event_begin_log.cc",
         "logging/rtc_event_log/events/rtc_event_end_log.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_logging__rtc_event_field",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_synchronization__yield",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -8212,16 +2927,6 @@ cc_library_static {
     name: "webrtc_logging__rtc_event_bwe",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.cc",
         "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.cc",
         "logging/rtc_event_log/events/rtc_event_probe_cluster_created.cc",
@@ -8230,15 +2935,6 @@ cc_library_static {
         "logging/rtc_event_log/events/rtc_event_route_change.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_logging__rtc_event_field",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -8248,31 +2944,12 @@ cc_library_static {
     name: "webrtc_logging__rtc_event_field",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.cc",
         "logging/rtc_event_log/events/rtc_event_field_encoding.cc",
         "logging/rtc_event_log/events/rtc_event_field_encoding_parser.cc",
         "logging/rtc_event_log/events/rtc_event_field_extraction.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_logging__rtc_event_number_encodings",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_synchronization__yield",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -8282,33 +2959,10 @@ cc_library_static {
     name: "webrtc_logging__rtc_event_log_impl_encoder",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
         "logging/rtc_event_log/encoder/blob_encoding.cc",
         "logging/rtc_event_log/encoder/delta_encoding.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_parameters",
-        "webrtc_logging__rtc_event_number_encodings",
-        "webrtc_rtc_base__bit_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__yield",
-        "webrtc_transport__network_control",
-    ],
 }
 
 /* From target:
@@ -8318,25 +2972,11 @@ cc_library_static {
     name: "webrtc_logging__rtc_event_number_encodings",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "logging/rtc_event_log/encoder/bit_writer.cc",
         "logging/rtc_event_log/encoder/rtc_event_log_encoder_common.cc",
         "logging/rtc_event_log/encoder/var_int.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__bit_buffer",
-        "webrtc_rtc_base__checks",
-    ],
 }
 
 /* From target:
@@ -8345,28 +2985,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_logging__rtc_event_pacing",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "logging/rtc_event_log/events/rtc_event_alr_state.cc",
-    ],
+    srcs: ["logging/rtc_event_log/events/rtc_event_alr_state.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_logging__rtc_event_field",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_synchronization__yield",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -8376,67 +2996,12 @@ cc_library_static {
     name: "webrtc_logging__rtc_event_rtp_rtcp",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video_codecs__scalability_mode",
         "logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.cc",
         "logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.cc",
         "logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.cc",
         "logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__rtp_headers",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_logging__rtc_event_field",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -8446,30 +3011,10 @@ cc_library_static {
     name: "webrtc_logging__rtc_event_video",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
         "logging/rtc_event_log/events/rtc_event_video_receive_stream_config.cc",
         "logging/rtc_event_log/events/rtc_event_video_send_stream_config.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_logging__rtc_event_field",
-        "webrtc_logging__rtc_stream_config",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_synchronization__yield",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -8478,27 +3023,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_logging__rtc_stream_config",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "logging/rtc_event_log/rtc_stream_config.cc",
-    ],
+    srcs: ["logging/rtc_event_log/rtc_stream_config.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_parameters",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -8508,62 +3034,6 @@ cc_library_static {
     name: "webrtc_media__rtc_audio_video",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_coding__default_neteq_factory",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__default_neteq_controller_factory",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_neteq__tick_timer",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_svc__svc_rate_allocator",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_capture__video_capture_internal_impl",
-        ":webrtc_video_codecs__scalability_mode",
-        ":webrtc_video_coding__webrtc_vp8_scalability",
         "media/engine/adm_helpers.cc",
         "media/engine/payload_type_mapper.cc",
         "media/engine/unhandled_packets_buffer.cc",
@@ -8573,105 +3043,6 @@ cc_library_static {
     ],
     host_supported: true,
     cflags: ["-DHAVE_WEBRTC_VIDEO"],
-    static_libs: [
-        "webrtc_aec_dump__null_aec_dump_factory",
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_api__transport_api",
-        "webrtc_async_audio_processing__async_audio_processing",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__neteq",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_mixer__audio_mixer_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_base64__base64",
-        "webrtc_call__call",
-        "webrtc_call__call_interfaces",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_call__video_stream_api",
-        "webrtc_common_video__common_video",
-        "webrtc_config__encoder_config",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_experiments__min_video_bitrate_experiment",
-        "webrtc_experiments__normalize_simulcast_size_experiment",
-        "webrtc_experiments__rate_control_settings",
-        "webrtc_experiments__stable_target_rate_experiment",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__audio_format_to_string",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__race_checker",
-        "webrtc_rtc_base__random",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_transport__bitrate_settings",
-        "webrtc_transport__field_trial_based_config",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__frame_decode_timing",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_capture__video_capture_module",
-        "webrtc_video_codecs__rtc_software_fallback_wrappers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_codec_interface",
-        "webrtc_video_coding__video_coding",
-        "webrtc_video_coding__video_coding_utility",
-        "webrtc_video_coding__webrtc_vp9_helpers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -8680,134 +3051,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_media__rtc_data_dcsctp_transport",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_public__factory",
-        ":webrtc_public__socket",
-        ":webrtc_public__utils",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "media/sctp/dcsctp_transport.cc",
-    ],
+    srcs: ["media/sctp/dcsctp_transport.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_p2p__rtc_p2p",
-        "webrtc_packet__chunk",
-        "webrtc_packet__sctp_packet",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__random",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_socket__dcsctp_socket",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_timer__task_queue_timeout",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -8816,134 +3061,9 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_media__rtc_data_sctp_transport_factory",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_public__factory",
-        ":webrtc_public__socket",
-        ":webrtc_public__utils",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "media/sctp/sctp_transport_factory.cc",
-    ],
+    srcs: ["media/sctp/sctp_transport_factory.cc"],
     host_supported: true,
     cflags: ["-DWEBRTC_HAVE_DCSCTP"],
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_media__rtc_data_dcsctp_transport",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_p2p__rtc_p2p",
-        "webrtc_packet__chunk",
-        "webrtc_packet__sctp_packet",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_socket__dcsctp_socket",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -8952,123 +3072,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_media__rtc_encoder_simulcast_proxy",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "media/engine/encoder_simulcast_proxy.cc",
-    ],
+    srcs: ["media/engine/encoder_simulcast_proxy.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_media__rtc_simulcast_encoder_adapter",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_codec_interface",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -9078,143 +3083,12 @@ cc_library_static {
     name: "webrtc_media__rtc_internal_video_codecs",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_svc__svc_rate_allocator",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        ":webrtc_video_coding__webrtc_vp8_scalability",
         "media/engine/fake_video_codec_factory.cc",
         "media/engine/internal_decoder_factory.cc",
         "media/engine/internal_encoder_factory.cc",
         "media/engine/multiplex_codec_factory.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__call_interfaces",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_call__video_stream_api",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__stable_target_rate_experiment",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_media__rtc_encoder_simulcast_proxy",
-        "webrtc_media__rtc_media_base",
-        "webrtc_media__rtc_simulcast_encoder_adapter",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_test__fake_video_codecs",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__rtc_software_fallback_wrappers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_codec_interface",
-        "webrtc_video_coding__webrtc_h264",
-        "webrtc_video_coding__webrtc_multiplex",
-        "webrtc_video_coding__webrtc_vp8",
-        "webrtc_video_coding__webrtc_vp9",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -9224,53 +3098,6 @@ cc_library_static {
     name: "webrtc_media__rtc_media_base",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "media/base/adapted_video_track_source.cc",
         "media/base/codec.cc",
         "media/base/media_channel.cc",
@@ -9286,80 +3113,6 @@ cc_library_static {
         "media/base/video_source_base.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__audio_options_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_async_audio_processing__async_audio_processing",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_audio_processing__audio_processing_statistics",
-        "webrtc_call__call_interfaces",
-        "webrtc_call__video_stream_api",
-        "webrtc_common_video__common_video",
-        "webrtc_config__encoder_config",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_crypto__options",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -9368,27 +3121,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_media__rtc_sdp_video_format_utils",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "media/base/sdp_video_format_utils.cc",
-    ],
+    srcs: ["media/base/sdp_video_format_utils.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
 }
 
 /* From target:
@@ -9397,130 +3131,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_media__rtc_simulcast_encoder_adapter",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "media/engine/simulcast_encoder_adapter.cc",
-    ],
+    srcs: ["media/engine/simulcast_encoder_adapter.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_call__video_stream_api",
-        "webrtc_common_video__common_video",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__encoder_info_settings",
-        "webrtc_experiments__rate_control_settings",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__rtc_software_fallback_wrappers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_codec_interface",
-        "webrtc_video_coding__video_coding_utility",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -9529,19 +3141,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_memory__aligned_malloc",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "rtc_base/memory/aligned_malloc.cc",
-    ],
+    srcs: ["rtc_base/memory/aligned_malloc.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -9550,28 +3151,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_metrics__global_metrics_logger_and_exporter",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/test/metrics/global_metrics_logger_and_exporter.cc",
-    ],
+    srcs: ["api/test/metrics/global_metrics_logger_and_exporter.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_metrics__metric",
-        "webrtc_metrics__metrics_logger",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
 }
 
 /* From target:
@@ -9580,23 +3161,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_metrics__metric",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/test/metrics/metric.cc",
-    ],
+    srcs: ["api/test/metrics/metric.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -9605,27 +3171,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_metrics__metrics_accumulator",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/test/metrics/metrics_accumulator.cc",
-    ],
+    srcs: ["api/test/metrics/metrics_accumulator.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_metrics__metric",
-        "webrtc_numerics__numerics",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -9634,29 +3181,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_metrics__metrics_logger",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/test/metrics/metrics_logger.cc",
-    ],
+    srcs: ["api/test/metrics/metrics_logger.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_metrics__metric",
-        "webrtc_metrics__metrics_accumulator",
-        "webrtc_numerics__numerics",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
 }
 
 /* From target:
@@ -9665,48 +3191,38 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_metrics__stdout_metrics_exporter",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/test/metrics/stdout_metrics_exporter.cc",
-    ],
+    srcs: ["api/test/metrics/stdout_metrics_exporter.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_metrics__metric",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__stringutils",
-    ],
 }
 
 /* From target:
 //api/neteq:default_neteq_controller_factory
 */
-filegroup {
+cc_library_static {
     name: "webrtc_neteq__default_neteq_controller_factory",
+    defaults: ["webrtc_defaults"],
     srcs: ["api/neteq/default_neteq_controller_factory.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //api/neteq:neteq_api
 */
-filegroup {
+cc_library_static {
     name: "webrtc_neteq__neteq_api",
+    defaults: ["webrtc_defaults"],
     srcs: ["api/neteq/neteq.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //api/neteq:tick_timer
 */
-filegroup {
+cc_library_static {
     name: "webrtc_neteq__tick_timer",
+    defaults: ["webrtc_defaults"],
     srcs: ["api/neteq/tick_timer.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -9715,12 +3231,7 @@ filegroup {
 cc_library_static {
     name: "webrtc_network__sent_packet",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/network/sent_packet.cc",
-    ],
+    srcs: ["rtc_base/network/sent_packet.cc"],
     host_supported: true,
 }
 
@@ -9731,15 +3242,6 @@ cc_library_static {
     name: "webrtc_ns__ns",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/ns/fast_math.cc",
         "modules/audio_processing/ns/histograms.cc",
         "modules/audio_processing/ns/noise_estimator.cc",
@@ -9755,36 +3257,29 @@ cc_library_static {
         "modules/audio_processing/ns/wiener_filter.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_audio_processing__audio_buffer",
-        "webrtc_audio_processing__high_pass_filter",
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_ooura__fft_size_256",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_utility__cascaded_biquad_filter",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/numeric:int128
 */
-filegroup {
+cc_library_static {
     name: "webrtc_numeric__int128",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/numeric/int128.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
@@ -9793,25 +3288,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_numerics__numerics",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/numerics/samples_stats_counter.cc",
-    ],
+    srcs: ["api/numerics/samples_stats_counter.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -9820,36 +3298,11 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_ooura__fft_size_128",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "common_audio/third_party/ooura/fft_size_128/ooura_fft.cc",
-    ],
+    srcs: ["common_audio/third_party/ooura/fft_size_128/ooura_fft.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_common_audio__common_audio",
-        "webrtc_common_audio__common_audio",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
     arch: {
         arm: {
-            srcs: [
-                ":webrtc_common_audio__common_audio_c_arm_asm",
-                "common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc",
-            ],
+            srcs: ["common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc"],
         },
         arm64: {
             srcs: ["common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc"],
@@ -9879,31 +3332,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_opus__audio_decoder_multiopus",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/audio_codecs/opus/audio_decoder_multi_channel_opus.cc",
-    ],
+    srcs: ["api/audio_codecs/opus/audio_decoder_multi_channel_opus.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__webrtc_multiopus",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -9912,40 +3342,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_opus__audio_decoder_opus",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "api/audio_codecs/opus/audio_decoder_opus.cc",
-    ],
+    srcs: ["api/audio_codecs/opus/audio_decoder_opus.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__webrtc_opus",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -9954,32 +3352,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_opus__audio_encoder_multiopus",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/audio_codecs/opus/audio_encoder_multi_channel_opus.cc",
-    ],
+    srcs: ["api/audio_codecs/opus/audio_encoder_multi_channel_opus.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__webrtc_multiopus",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_opus__audio_encoder_opus_config",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -9988,41 +3362,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_opus__audio_encoder_opus",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "api/audio_codecs/opus/audio_encoder_opus.cc",
-    ],
+    srcs: ["api/audio_codecs/opus/audio_encoder_opus.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_coding__webrtc_opus",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_opus__audio_encoder_opus_config",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -10032,9 +3373,6 @@ cc_library_static {
     name: "webrtc_opus__audio_encoder_opus_config",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_types__bad_optional_access",
         "api/audio_codecs/opus/audio_encoder_multi_channel_opus_config.cc",
         "api/audio_codecs/opus/audio_encoder_opus_config.cc",
     ],
@@ -10048,73 +3386,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_p2p__libstunprober",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        "p2p/stunprober/stun_prober.cc",
-    ],
+    srcs: ["p2p/stunprober/stun_prober.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__rtc_error",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_p2p__rtc_p2p",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -10124,44 +3397,6 @@ cc_library_static {
     name: "webrtc_p2p__rtc_p2p",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
         "p2p/base/async_stun_tcp_socket.cc",
         "p2p/base/basic_async_resolver_factory.cc",
         "p2p/base/basic_ice_controller.cc",
@@ -10194,47 +3429,6 @@ cc_library_static {
         "p2p/client/turn_port_factory.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__candidate",
-        "webrtc_api__dtls_transport_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_base64__base64",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_crypto__options",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_logging__ice_log",
-        "webrtc_network__sent_packet",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__buffer_queue",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__net_helpers",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rate_tracker",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__weak_ptr",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_transport__field_trial_based_config",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -10243,19 +3437,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_pacing__interval_budget",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "modules/pacing/interval_budget.cc",
-    ],
+    srcs: ["modules/pacing/interval_budget.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -10265,53 +3448,6 @@ cc_library_static {
     name: "webrtc_pacing__pacing",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/pacing/bitrate_prober.cc",
         "modules/pacing/pacing_controller.cc",
         "modules/pacing/packet_router.cc",
@@ -10319,81 +3455,6 @@ cc_library_static {
         "modules/pacing/task_queue_paced_sender.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_logging__rtc_event_bwe",
-        "webrtc_logging__rtc_event_pacing",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_pacing__interval_budget",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_transport__field_trial_based_config",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__data_size",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -10403,15 +3464,6 @@ cc_library_static {
     name: "webrtc_packet__chunk",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "net/dcsctp/packet/chunk/abort_chunk.cc",
         "net/dcsctp/packet/chunk/chunk.cc",
         "net/dcsctp/packet/chunk/cookie_ack_chunk.cc",
@@ -10432,16 +3484,6 @@ cc_library_static {
         "net/dcsctp/packet/chunk/shutdown_complete_chunk.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_packet__error_cause",
-        "webrtc_packet__parameter",
-        "webrtc_packet__tlv_trait",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -10450,27 +3492,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_packet__chunk_validators",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "net/dcsctp/packet/chunk_validators.cc",
-    ],
+    srcs: ["net/dcsctp/packet/chunk_validators.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_packet__chunk",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -10479,22 +3502,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_packet__crc32c",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "net/dcsctp/packet/crc32c.cc",
-    ],
+    srcs: ["net/dcsctp/packet/crc32c.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -10504,15 +3513,6 @@ cc_library_static {
     name: "webrtc_packet__error_cause",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.cc",
         "net/dcsctp/packet/error_cause/error_cause.cc",
         "net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.cc",
@@ -10529,15 +3529,6 @@ cc_library_static {
         "net/dcsctp/packet/error_cause/user_initiated_abort_cause.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_packet__parameter",
-        "webrtc_packet__tlv_trait",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -10547,15 +3538,6 @@ cc_library_static {
     name: "webrtc_packet__parameter",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.cc",
         "net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.cc",
         "net/dcsctp/packet/parameter/forward_tsn_supported_parameter.cc",
@@ -10569,14 +3551,6 @@ cc_library_static {
         "net/dcsctp/packet/parameter/supported_extensions_parameter.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_packet__tlv_trait",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -10585,31 +3559,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_packet__sctp_packet",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "net/dcsctp/packet/sctp_packet.cc",
-    ],
+    srcs: ["net/dcsctp/packet/sctp_packet.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_packet__chunk",
-        "webrtc_packet__crc32c",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -10618,25 +3569,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_packet__tlv_trait",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "net/dcsctp/packet/tlv_trait.cc",
-    ],
+    srcs: ["net/dcsctp/packet/tlv_trait.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -10645,140 +3579,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_pc__audio_rtp_receiver",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_pc__channel",
-        ":webrtc_pc__rtp_media_utils",
-        ":webrtc_pc__session_description",
-        ":webrtc_pc__simulcast_description",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/audio_rtp_receiver.cc",
-    ],
+    srcs: ["pc/audio_rtp_receiver.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__dtls_transport_interface",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_call__rtp_receiver",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_crypto__options",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_network__sent_packet",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_p2p__rtc_p2p",
-        "webrtc_pc__audio_track",
-        "webrtc_pc__jitter_buffer_delay",
-        "webrtc_pc__media_protocol_names",
-        "webrtc_pc__media_stream",
-        "webrtc_pc__proxy",
-        "webrtc_pc__remote_audio_source",
-        "webrtc_pc__rtp_receiver",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -10787,39 +3589,18 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_pc__audio_track",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/audio_track.cc",
-    ],
+    srcs: ["pc/audio_track.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__media_stream_interface",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-    ],
 }
 
 /* From target:
 //pc:channel
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__channel",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/channel.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -10828,144 +3609,18 @@ filegroup {
 cc_library_static {
     name: "webrtc_pc__connection_context",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_public__factory",
-        ":webrtc_public__socket",
-        ":webrtc_public__utils",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/connection_context.cc",
-    ],
+    srcs: ["pc/connection_context.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_media__rtc_data_sctp_transport_factory",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_p2p__rtc_p2p",
-        "webrtc_packet__chunk",
-        "webrtc_packet__sctp_packet",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_socket__dcsctp_socket",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_transport__field_trial_based_config",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
 //pc:data_channel_controller
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__data_channel_controller",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/data_channel_controller.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -10974,139 +3629,28 @@ filegroup {
 cc_library_static {
     name: "webrtc_pc__data_channel_utils",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/data_channel_utils.cc",
-    ],
+    srcs: ["pc/data_channel_utils.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
 //pc:dtls_srtp_transport
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__dtls_srtp_transport",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/dtls_srtp_transport.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:dtls_transport
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__dtls_transport",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/dtls_transport.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -11115,131 +3659,18 @@ filegroup {
 cc_library_static {
     name: "webrtc_pc__dtmf_sender",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/dtmf_sender.cc",
-    ],
+    srcs: ["pc/dtmf_sender.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_pc__proxy",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
 //pc:external_hmac
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__external_hmac",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/external_hmac.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -11248,131 +3679,18 @@ filegroup {
 cc_library_static {
     name: "webrtc_pc__ice_server_parsing",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/ice_server_parsing.cc",
-    ],
+    srcs: ["pc/ice_server_parsing.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_p2p__rtc_p2p",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
 //pc:ice_transport
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__ice_transport",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/ice_transport.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -11381,65 +3699,58 @@ filegroup {
 cc_library_static {
     name: "webrtc_pc__jitter_buffer_delay",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "pc/jitter_buffer_delay.cc",
-    ],
+    srcs: ["pc/jitter_buffer_delay.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
 //pc:jsep_transport
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__jsep_transport",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/jsep_transport.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:jsep_transport_collection
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__jsep_transport_collection",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/jsep_transport_collection.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:jsep_transport_controller
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__jsep_transport_controller",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/jsep_transport_controller.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:legacy_stats_collector
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__legacy_stats_collector",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/legacy_stats_collector.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:local_audio_source
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__local_audio_source",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/local_audio_source.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -11448,26 +3759,18 @@ filegroup {
 cc_library_static {
     name: "webrtc_pc__media_protocol_names",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "pc/media_protocol_names.cc",
-    ],
+    srcs: ["pc/media_protocol_names.cc"],
     host_supported: true,
 }
 
 /* From target:
 //pc:media_session
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__media_session",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/media_session.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -11476,122 +3779,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_pc__media_stream",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/media_stream.cc",
-    ],
+    srcs: ["pc/media_stream.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -11600,47 +3789,28 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_pc__media_stream_observer",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/media_stream_observer.cc",
-    ],
+    srcs: ["pc/media_stream_observer.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__media_stream_interface",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-    ],
 }
 
 /* From target:
 //pc:peer_connection
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__peer_connection",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/peer_connection.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:peer_connection_factory
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__peer_connection_factory",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/peer_connection_factory.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -11649,122 +3819,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_pc__peer_connection_message_handler",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/peer_connection_message_handler.cc",
-    ],
+    srcs: ["pc/peer_connection_message_handler.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -11773,34 +3829,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_pc__proxy",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "pc/proxy.cc",
-    ],
+    srcs: ["pc/proxy.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -11809,165 +3839,48 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_pc__remote_audio_source",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_pc__channel",
-        ":webrtc_pc__rtp_media_utils",
-        ":webrtc_pc__session_description",
-        ":webrtc_pc__simulcast_description",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/remote_audio_source.cc",
-    ],
+    srcs: ["pc/remote_audio_source.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_call__rtp_receiver",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_crypto__options",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_network__sent_packet",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_p2p__rtc_p2p",
-        "webrtc_pc__media_protocol_names",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
 //pc:rtc_stats_collector
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__rtc_stats_collector",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/rtc_stats_collector.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:rtc_stats_traversal
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__rtc_stats_traversal",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/rtc_stats_traversal.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:rtcp_mux_filter
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__rtcp_mux_filter",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/rtcp_mux_filter.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:rtp_media_utils
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__rtp_media_utils",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/rtp_media_utils.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -11976,127 +3889,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_pc__rtp_parameters_conversion",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_pc__session_description",
-        ":webrtc_pc__simulcast_description",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/rtp_parameters_conversion.cc",
-    ],
+    srcs: ["pc/rtp_parameters_conversion.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_p2p__rtc_p2p",
-        "webrtc_pc__media_protocol_names",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -12105,127 +3899,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_pc__rtp_receiver",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/rtp_receiver.cc",
-    ],
+    srcs: ["pc/rtp_receiver.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__dtls_transport_interface",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_pc__media_stream",
-        "webrtc_pc__proxy",
-        "webrtc_pc__video_track_source",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -12234,128 +3909,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_pc__rtp_sender",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/rtp_sender.cc",
-    ],
+    srcs: ["pc/rtp_sender.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__audio_options_api",
-        "webrtc_api__dtls_transport_interface",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_pc__dtmf_sender",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -12364,174 +3919,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_pc__rtp_transceiver",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_pc__channel",
-        ":webrtc_pc__dtls_srtp_transport",
-        ":webrtc_pc__dtls_transport",
-        ":webrtc_pc__external_hmac",
-        ":webrtc_pc__ice_transport",
-        ":webrtc_pc__jsep_transport",
-        ":webrtc_pc__jsep_transport_collection",
-        ":webrtc_pc__jsep_transport_controller",
-        ":webrtc_pc__rtcp_mux_filter",
-        ":webrtc_pc__rtp_media_utils",
-        ":webrtc_pc__rtp_transport",
-        ":webrtc_pc__sctp_transport",
-        ":webrtc_pc__sctp_utils",
-        ":webrtc_pc__session_description",
-        ":webrtc_pc__simulcast_description",
-        ":webrtc_pc__srtp_filter",
-        ":webrtc_pc__srtp_session",
-        ":webrtc_pc__srtp_transport",
-        ":webrtc_pc__transport_stats",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_public__factory",
-        ":webrtc_public__socket",
-        ":webrtc_public__utils",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/rtp_transceiver.cc",
-    ],
+    srcs: ["pc/rtp_transceiver.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__audio_options_api",
-        "webrtc_api__candidate",
-        "webrtc_api__dtls_transport_interface",
-        "webrtc_api__ice_transport_factory",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_base64__base64",
-        "webrtc_call__call_interfaces",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_call__rtp_receiver",
-        "webrtc_call__video_stream_api",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_crypto__options",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_network__sent_packet",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_p2p__rtc_p2p",
-        "webrtc_packet__chunk",
-        "webrtc_packet__sctp_packet",
-        "webrtc_pc__connection_context",
-        "webrtc_pc__media_protocol_names",
-        "webrtc_pc__peer_connection_message_handler",
-        "webrtc_pc__proxy",
-        "webrtc_pc__rtp_parameters_conversion",
-        "webrtc_pc__rtp_receiver",
-        "webrtc_pc__rtp_sender",
-        "webrtc_pc__sctp_data_channel",
-        "webrtc_pc__usage_pattern",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_socket__dcsctp_socket",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -12540,185 +3929,18 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_pc__rtp_transmission_manager",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_pc__channel",
-        ":webrtc_pc__dtls_srtp_transport",
-        ":webrtc_pc__dtls_transport",
-        ":webrtc_pc__external_hmac",
-        ":webrtc_pc__ice_transport",
-        ":webrtc_pc__jsep_transport",
-        ":webrtc_pc__jsep_transport_collection",
-        ":webrtc_pc__jsep_transport_controller",
-        ":webrtc_pc__rtcp_mux_filter",
-        ":webrtc_pc__rtp_media_utils",
-        ":webrtc_pc__rtp_transport",
-        ":webrtc_pc__sctp_transport",
-        ":webrtc_pc__sctp_utils",
-        ":webrtc_pc__session_description",
-        ":webrtc_pc__simulcast_description",
-        ":webrtc_pc__srtp_filter",
-        ":webrtc_pc__srtp_session",
-        ":webrtc_pc__srtp_transport",
-        ":webrtc_pc__transport_stats",
-        ":webrtc_pc__video_track_source_proxy",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_public__factory",
-        ":webrtc_public__socket",
-        ":webrtc_public__utils",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/rtp_transmission_manager.cc",
-    ],
+    srcs: ["pc/rtp_transmission_manager.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__candidate",
-        "webrtc_api__dtls_transport_interface",
-        "webrtc_api__ice_transport_factory",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_base64__base64",
-        "webrtc_call__call_interfaces",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_call__rtp_receiver",
-        "webrtc_call__video_stream_api",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_crypto__options",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_network__sent_packet",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_p2p__rtc_p2p",
-        "webrtc_packet__chunk",
-        "webrtc_packet__sctp_packet",
-        "webrtc_pc__audio_rtp_receiver",
-        "webrtc_pc__media_protocol_names",
-        "webrtc_pc__peer_connection_message_handler",
-        "webrtc_pc__proxy",
-        "webrtc_pc__rtp_receiver",
-        "webrtc_pc__rtp_sender",
-        "webrtc_pc__rtp_transceiver",
-        "webrtc_pc__sctp_data_channel",
-        "webrtc_pc__transceiver_list",
-        "webrtc_pc__usage_pattern",
-        "webrtc_pc__video_rtp_receiver",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__weak_ptr",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_socket__dcsctp_socket",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
 //pc:rtp_transport
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__rtp_transport",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/rtp_transport.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -12727,215 +3949,118 @@ filegroup {
 cc_library_static {
     name: "webrtc_pc__sctp_data_channel",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_pc__sctp_utils",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/sctp_data_channel.cc",
-    ],
+    srcs: ["pc/sctp_data_channel.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_p2p__rtc_p2p",
-        "webrtc_pc__data_channel_utils",
-        "webrtc_pc__proxy",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
 //pc:sctp_transport
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__sctp_transport",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/sctp_transport.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:sctp_utils
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__sctp_utils",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/sctp_utils.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:sdp_offer_answer
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__sdp_offer_answer",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/sdp_offer_answer.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:sdp_serializer
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__sdp_serializer",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/sdp_serializer.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:sdp_utils
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__sdp_utils",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/sdp_utils.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:session_description
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__session_description",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/session_description.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:simulcast_description
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__simulcast_description",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/simulcast_description.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:srtp_filter
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__srtp_filter",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/srtp_filter.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:srtp_session
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__srtp_session",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/srtp_session.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:srtp_transport
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__srtp_transport",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/srtp_transport.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:track_media_info_map
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__track_media_info_map",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/track_media_info_map.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -12944,178 +4069,18 @@ filegroup {
 cc_library_static {
     name: "webrtc_pc__transceiver_list",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_pc__channel",
-        ":webrtc_pc__dtls_srtp_transport",
-        ":webrtc_pc__dtls_transport",
-        ":webrtc_pc__external_hmac",
-        ":webrtc_pc__ice_transport",
-        ":webrtc_pc__jsep_transport",
-        ":webrtc_pc__jsep_transport_collection",
-        ":webrtc_pc__jsep_transport_controller",
-        ":webrtc_pc__rtcp_mux_filter",
-        ":webrtc_pc__rtp_media_utils",
-        ":webrtc_pc__rtp_transport",
-        ":webrtc_pc__sctp_transport",
-        ":webrtc_pc__sctp_utils",
-        ":webrtc_pc__session_description",
-        ":webrtc_pc__simulcast_description",
-        ":webrtc_pc__srtp_filter",
-        ":webrtc_pc__srtp_session",
-        ":webrtc_pc__srtp_transport",
-        ":webrtc_pc__transport_stats",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_public__factory",
-        ":webrtc_public__socket",
-        ":webrtc_public__utils",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/transceiver_list.cc",
-    ],
+    srcs: ["pc/transceiver_list.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__candidate",
-        "webrtc_api__dtls_transport_interface",
-        "webrtc_api__ice_transport_factory",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_base64__base64",
-        "webrtc_call__call_interfaces",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_call__rtp_receiver",
-        "webrtc_call__video_stream_api",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_crypto__options",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_network__sent_packet",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_p2p__rtc_p2p",
-        "webrtc_packet__chunk",
-        "webrtc_packet__sctp_packet",
-        "webrtc_pc__media_protocol_names",
-        "webrtc_pc__peer_connection_message_handler",
-        "webrtc_pc__proxy",
-        "webrtc_pc__rtp_transceiver",
-        "webrtc_pc__sctp_data_channel",
-        "webrtc_pc__usage_pattern",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_socket__dcsctp_socket",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
 //pc:transport_stats
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__transport_stats",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/transport_stats.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -13124,122 +4089,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_pc__usage_pattern",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/usage_pattern.cc",
-    ],
+    srcs: ["pc/usage_pattern.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -13248,131 +4099,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_pc__video_rtp_receiver",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_pc__video_track_source_proxy",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/video_rtp_receiver.cc",
-    ],
+    srcs: ["pc/video_rtp_receiver.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__dtls_transport_interface",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_pc__jitter_buffer_delay",
-        "webrtc_pc__media_stream",
-        "webrtc_pc__proxy",
-        "webrtc_pc__rtp_receiver",
-        "webrtc_pc__video_rtp_track_source",
-        "webrtc_pc__video_track",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -13381,122 +4109,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_pc__video_rtp_track_source",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/video_rtp_track_source.cc",
-    ],
+    srcs: ["pc/video_rtp_track_source.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_pc__video_track_source",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -13505,125 +4119,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_pc__video_track",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_pc__video_track_source_proxy",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/video_track.cc",
-    ],
+    srcs: ["pc/video_track.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_pc__proxy",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -13632,181 +4129,95 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_pc__video_track_source",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "pc/video_track_source.cc",
-    ],
+    srcs: ["pc/video_track_source.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
 //pc:video_track_source_proxy
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__video_track_source_proxy",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/video_track_source_proxy.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //pc:webrtc_sdp
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__webrtc_sdp",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "pc/jsep_ice_candidate.cc",
         "pc/jsep_session_description.cc",
         "pc/webrtc_sdp.cc",
     ],
+    host_supported: true,
 }
 
 /* From target:
 //pc:webrtc_session_description_factory
 */
-filegroup {
+cc_library_static {
     name: "webrtc_pc__webrtc_session_description_factory",
+    defaults: ["webrtc_defaults"],
     srcs: ["pc/webrtc_session_description_factory.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/profiling:exponential_biased
 */
-filegroup {
+cc_library_static {
     name: "webrtc_profiling__exponential_biased",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/profiling/internal/exponential_biased.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //net/dcsctp/public:factory
 */
-filegroup {
+cc_library_static {
     name: "webrtc_public__factory",
+    defaults: ["webrtc_defaults"],
     srcs: ["net/dcsctp/public/dcsctp_socket_factory.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //net/dcsctp/public:socket
 */
-filegroup {
+cc_library_static {
     name: "webrtc_public__socket",
+    defaults: ["webrtc_defaults"],
     srcs: ["net/dcsctp/public/dcsctp_handover_state.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //net/dcsctp/public:utils
 */
-filegroup {
+cc_library_static {
     name: "webrtc_public__utils",
+    defaults: ["webrtc_defaults"],
     srcs: ["net/dcsctp/public/text_pcap_packet_observer.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -13816,44 +4227,6 @@ cc_library_static {
     name: "webrtc_remote_bitrate_estimator__remote_bitrate_estimator",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/remote_bitrate_estimator/aimd_rate_control.cc",
         "modules/remote_bitrate_estimator/bwe_defines.cc",
         "modules/remote_bitrate_estimator/inter_arrival.cc",
@@ -13866,35 +4239,6 @@ cc_library_static {
     ],
     host_supported: true,
     cflags: ["-DBWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0"],
-    static_libs: [
-        "webrtc_api__rtp_headers",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_goog_cc__link_capacity_estimator",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__race_checker",
-        "webrtc_rtc_base__rate_statistics",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_transport__field_trial_based_config",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__data_size",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -13903,32 +4247,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_render__incoming_video_stream",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "video/render/incoming_video_stream.cc",
-    ],
+    srcs: ["video/render/incoming_video_stream.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_render__video_render_frames",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__race_checker",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__time_delta",
-        "webrtc_video__video_frame",
-    ],
 }
 
 /* From target:
@@ -13937,28 +4257,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_render__video_render_frames",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "video/render/video_render_frames.cc",
-    ],
+    srcs: ["video/render/video_render_frames.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_video__video_frame",
-    ],
 }
 
 /* From target:
@@ -13968,40 +4268,10 @@ cc_library_static {
     name: "webrtc_rnn_vad__rnn_vad",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/agc2/rnn_vad/features_extraction.cc",
         "modules/audio_processing/agc2/rnn_vad/rnn.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__biquad_filter",
-        "webrtc_agc2__cpu_features",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rnn_vad__rnn_vad_lp_residual",
-        "webrtc_rnn_vad__rnn_vad_pitch",
-        "webrtc_rnn_vad__rnn_vad_spectral_features",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -14010,38 +4280,27 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rnn_vad__rnn_vad_auto_correlation",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/agc2/rnn_vad/auto_correlation.cc",
-    ],
+    srcs: ["modules/audio_processing/agc2/rnn_vad/auto_correlation.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_utility__pffft_wrapper",
-    ],
 }
 
 /* From target:
 //modules/audio_processing/agc2/rnn_vad:rnn_vad_layers
 */
-filegroup {
+cc_library_static {
     name: "webrtc_rnn_vad__rnn_vad_layers",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "modules/audio_processing/agc2/rnn_vad/rnn_fc.cc",
         "modules/audio_processing/agc2/rnn_vad/rnn_gru.cc",
     ],
+    host_supported: true,
+    arch: {
+        x86_64: {
+        },
+        x86: {
+        },
+    },
 }
 
 /* From target:
@@ -14050,19 +4309,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_rnn_vad__rnn_vad_lp_residual",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "modules/audio_processing/agc2/rnn_vad/lp_residual.cc",
-    ],
+    srcs: ["modules/audio_processing/agc2/rnn_vad/lp_residual.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -14072,34 +4320,14 @@ cc_library_static {
     name: "webrtc_rnn_vad__rnn_vad_pitch",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/agc2/rnn_vad/pitch_search.cc",
         "modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rnn_vad__rnn_vad_auto_correlation",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
     arch: {
         x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
         },
         x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
         },
     },
 }
@@ -14111,27 +4339,10 @@ cc_library_static {
     name: "webrtc_rnn_vad__rnn_vad_spectral_features",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/agc2/rnn_vad/spectral_features.cc",
         "modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_utility__pffft_wrapper",
-    ],
 }
 
 /* From target:
@@ -14140,26 +4351,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rnn_vad__vector_math_avx2",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/audio_processing/agc2/rnn_vad/vector_math_avx2.cc",
-    ],
+    srcs: ["modules/audio_processing/agc2/rnn_vad/vector_math_avx2.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-    ],
     arch: {
         arm: {
             enabled: false,
@@ -14179,26 +4372,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__async_resolver_interface",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/async_resolver_interface.cc",
-    ],
+    srcs: ["rtc_base/async_resolver_interface.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -14207,27 +4382,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__async_socket",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/async_socket.cc",
-    ],
+    srcs: ["rtc_base/async_socket.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -14236,30 +4392,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__audio_format_to_string",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/strings/audio_format_to_string.cc",
-    ],
+    srcs: ["rtc_base/strings/audio_format_to_string.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -14268,27 +4402,18 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__bit_buffer",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "rtc_base/bit_buffer.cc",
-    ],
+    srcs: ["rtc_base/bit_buffer.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
 //rtc_base:bitstream_reader
 */
-filegroup {
+cc_library_static {
     name: "webrtc_rtc_base__bitstream_reader",
+    defaults: ["webrtc_defaults"],
     srcs: ["rtc_base/bitstream_reader.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -14297,26 +4422,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_rtc_base__buffer_queue",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/buffer_queue.cc",
-    ],
+    srcs: ["rtc_base/buffer_queue.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -14325,30 +4432,18 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__byte_buffer",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "rtc_base/byte_buffer.cc",
-    ],
+    srcs: ["rtc_base/byte_buffer.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__zero_memory",
-    ],
 }
 
 /* From target:
 //rtc_base:callback_list
 */
-filegroup {
+cc_library_static {
     name: "webrtc_rtc_base__callback_list",
+    defaults: ["webrtc_defaults"],
     srcs: ["rtc_base/callback_list.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -14357,17 +4452,7 @@ filegroup {
 cc_library_static {
     name: "webrtc_rtc_base__checks",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "rtc_base/checks.cc",
-    ],
+    srcs: ["rtc_base/checks.cc"],
     host_supported: true,
 }
 
@@ -14377,22 +4462,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__copy_on_write_buffer",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "rtc_base/copy_on_write_buffer.cc",
-    ],
+    srcs: ["rtc_base/copy_on_write_buffer.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__zero_memory",
-    ],
 }
 
 /* From target:
@@ -14401,23 +4472,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__criticalsection",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "rtc_base/deprecated/recursive_critical_section.cc",
-    ],
+    srcs: ["rtc_base/deprecated/recursive_critical_section.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -14426,29 +4482,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__event_tracer",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/event_tracer.cc",
-    ],
+    srcs: ["rtc_base/event_tracer.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -14457,20 +4492,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__histogram_percentile_counter",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/numerics/histogram_percentile_counter.cc",
-    ],
+    srcs: ["rtc_base/numerics/histogram_percentile_counter.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -14479,24 +4502,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__ip_address",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/ip_address.cc",
-    ],
+    srcs: ["rtc_base/ip_address.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__net_helpers",
-        "webrtc_rtc_base__stringutils",
-    ],
 }
 
 /* From target:
@@ -14505,27 +4512,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__logging",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/logging.cc",
-    ],
+    srcs: ["rtc_base/logging.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_synchronization__yield",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -14534,26 +4522,18 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__net_helpers",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "rtc_base/net_helpers.cc",
-    ],
+    srcs: ["rtc_base/net_helpers.cc"],
     host_supported: true,
 }
 
 /* From target:
 //rtc_base:network_constants
 */
-filegroup {
+cc_library_static {
     name: "webrtc_rtc_base__network_constants",
+    defaults: ["webrtc_defaults"],
     srcs: ["rtc_base/network_constants.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -14562,27 +4542,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_rtc_base__null_socket_server",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/null_socket_server.cc",
-    ],
+    srcs: ["rtc_base/null_socket_server.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_synchronization__yield",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -14591,27 +4552,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__platform_thread",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/platform_thread.cc",
-    ],
+    srcs: ["rtc_base/platform_thread.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -14620,19 +4562,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__platform_thread_types",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "rtc_base/platform_thread_types.cc",
-    ],
+    srcs: ["rtc_base/platform_thread_types.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -14641,22 +4572,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__race_checker",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "rtc_base/race_checker.cc",
-    ],
+    srcs: ["rtc_base/race_checker.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-    ],
 }
 
 /* From target:
@@ -14665,19 +4582,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__random",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "rtc_base/random.cc",
-    ],
+    srcs: ["rtc_base/random.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -14686,27 +4592,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__rate_limiter",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/rate_limiter.cc",
-    ],
+    srcs: ["rtc_base/rate_limiter.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rate_statistics",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
 }
 
 /* From target:
@@ -14715,25 +4602,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__rate_statistics",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/rate_statistics.cc",
-    ],
+    srcs: ["rtc_base/rate_statistics.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -14742,23 +4612,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__rate_tracker",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/rate_tracker.cc",
-    ],
+    srcs: ["rtc_base/rate_tracker.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__timeutils",
-    ],
 }
 
 /* From target:
@@ -14768,41 +4623,6 @@ cc_library_static {
     name: "webrtc_rtc_base__rtc_base",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
         "rtc_base/async_packet_socket.cc",
         "rtc_base/async_tcp_socket.cc",
         "rtc_base/async_udp_socket.cc",
@@ -14840,41 +4660,6 @@ cc_library_static {
         "rtc_base/unique_id_generator.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_base64__base64",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_network__sent_packet",
-        "webrtc_numerics__numerics",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__async_socket",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__null_socket_server",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_task_utils__repeating_task",
-        "webrtc_transport__field_trial_based_config",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -14883,25 +4668,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__rtc_event",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/event.cc",
-    ],
+    srcs: ["rtc_base/event.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_synchronization__yield_policy",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -14911,29 +4679,21 @@ cc_library_static {
     name: "webrtc_rtc_base__rtc_numerics",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "rtc_base/numerics/event_based_exponential_moving_average.cc",
         "rtc_base/numerics/exp_filter.cc",
         "rtc_base/numerics/moving_average.cc",
     ],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
 //rtc_base:rtc_operations_chain
 */
-filegroup {
+cc_library_static {
     name: "webrtc_rtc_base__rtc_operations_chain",
+    defaults: ["webrtc_defaults"],
     srcs: ["rtc_base/operations_chain.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -14942,23 +4702,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_rtc_base__rtc_task_queue",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/task_queue.cc",
-    ],
+    srcs: ["rtc_base/task_queue.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_task_queue__task_queue",
-    ],
 }
 
 /* From target:
@@ -14967,30 +4712,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__rtc_task_queue_libevent",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/task_queue_libevent.cc",
-    ],
+    srcs: ["rtc_base/task_queue_libevent.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -14999,20 +4722,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__sample_counter",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/numerics/sample_counter.cc",
-    ],
+    srcs: ["rtc_base/numerics/sample_counter.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -15021,26 +4732,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__socket",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/socket.cc",
-    ],
+    srcs: ["rtc_base/socket.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -15049,28 +4742,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__socket_address",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/socket_address.cc",
-    ],
+    srcs: ["rtc_base/socket_address.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__net_helpers",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -15080,15 +4753,6 @@ cc_library_static {
     name: "webrtc_rtc_base__stringutils",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "rtc_base/string_encode.cc",
         "rtc_base/string_to_number.cc",
         "rtc_base/string_utils.cc",
@@ -15096,7 +4760,6 @@ cc_library_static {
         "rtc_base/strings/string_format.cc",
     ],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -15106,16 +4769,6 @@ cc_library_static {
     name: "webrtc_rtc_base__threading",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "rtc_base/async_resolver.cc",
         "rtc_base/internal/default_socket_server.cc",
         "rtc_base/network_monitor.cc",
@@ -15124,30 +4777,6 @@ cc_library_static {
         "rtc_base/thread.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__criticalsection",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__null_socket_server",
-        "webrtc_rtc_base__platform_thread",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -15156,26 +4785,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__timestamp_aligner",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/timestamp_aligner.cc",
-    ],
+    srcs: ["rtc_base/timestamp_aligner.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -15185,23 +4796,10 @@ cc_library_static {
     name: "webrtc_rtc_base__timeutils",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "rtc_base/system_time.cc",
         "rtc_base/time_utils.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__stringutils",
-    ],
 }
 
 /* From target:
@@ -15210,25 +4808,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__weak_ptr",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/weak_ptr.cc",
-    ],
+    srcs: ["rtc_base/weak_ptr.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -15237,19 +4818,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_base__zero_memory",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "rtc_base/zero_memory.cc",
-    ],
+    srcs: ["rtc_base/zero_memory.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -15259,24 +4829,10 @@ cc_library_static {
     name: "webrtc_rtc_event_log__rtc_event_log",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "api/rtc_event_log/rtc_event.cc",
         "api/rtc_event_log/rtc_event_log.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_task_queue__task_queue",
-    ],
 }
 
 /* From target:
@@ -15285,28 +4841,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtc_event_log__rtc_event_log_factory",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/rtc_event_log/rtc_event_log_factory.cc",
-    ],
+    srcs: ["api/rtc_event_log/rtc_event_log_factory.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_task_queue__task_queue",
-    ],
 }
 
 /* From target:
@@ -15315,133 +4851,18 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtp__control_handler",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "modules/congestion_controller/rtp/control_handler.cc",
-    ],
+    srcs: ["modules/congestion_controller/rtp/control_handler.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_pacing__pacing",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__data_size",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
 //api/transport/rtp:dependency_descriptor
 */
-filegroup {
+cc_library_static {
     name: "webrtc_rtp__dependency_descriptor",
+    defaults: ["webrtc_defaults"],
     srcs: ["api/transport/rtp/dependency_descriptor.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -15451,69 +4872,10 @@ cc_library_static {
     name: "webrtc_rtp__transport_feedback",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/congestion_controller/rtp/transport_feedback_adapter.cc",
         "modules/congestion_controller/rtp/transport_feedback_demuxer.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_network__sent_packet",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__data_size",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -15523,53 +4885,6 @@ cc_library_static {
     name: "webrtc_rtp_rtcp__rtp_rtcp",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/rtp_rtcp/source/absolute_capture_time_interpolator.cc",
         "modules/rtp_rtcp/source/absolute_capture_time_sender.cc",
         "modules/rtp_rtcp/source/active_decode_targets_helper.cc",
@@ -15622,88 +4937,6 @@ cc_library_static {
     ],
     host_supported: true,
     cflags: ["-DBWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0"],
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__libjingle_peerconnection_api",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__transport_api",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_common_video__common_video",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_logging__rtc_event_audio",
-        "webrtc_logging__rtc_event_rtp_rtcp",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_remote_bitrate_estimator__remote_bitrate_estimator",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__bit_buffer",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__race_checker",
-        "webrtc_rtc_base__random",
-        "webrtc_rtc_base__rate_limiter",
-        "webrtc_rtc_base__rate_statistics",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_rtp_rtcp__rtp_video_header",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_task_utils__repeating_task",
-        "webrtc_transport__field_trial_based_config",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -15713,44 +4946,6 @@ cc_library_static {
     name: "webrtc_rtp_rtcp__rtp_rtcp_format",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/rtp_rtcp/include/report_block_data.cc",
         "modules/rtp_rtcp/include/rtp_rtcp_defines.cc",
         "modules/rtp_rtcp/source/rtcp_packet.cc",
@@ -15793,32 +4988,6 @@ cc_library_static {
         "modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_common_video__common_video",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__bit_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-    ],
 }
 
 /* From target:
@@ -15827,30 +4996,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rtp_rtcp__rtp_video_header",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video__video_frame_metadata",
-        "modules/rtp_rtcp/source/rtp_video_header.cc",
-    ],
+    srcs: ["modules/rtp_rtcp/source/rtp_video_header.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__rtp_headers",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-    ],
 }
 
 /* From target:
@@ -15859,31 +5006,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rx__data_tracker",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_public__socket",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "net/dcsctp/rx/data_tracker.cc",
-    ],
+    srcs: ["net/dcsctp/rx/data_tracker.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_packet__chunk",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-        "webrtc_timer__timer",
-    ],
 }
 
 /* From target:
@@ -15892,62 +5016,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rx__interleaved_reassembly_streams",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_public__socket",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        "net/dcsctp/rx/interleaved_reassembly_streams.cc",
-    ],
+    srcs: ["net/dcsctp/rx/interleaved_reassembly_streams.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_packet__chunk",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -15956,64 +5026,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rx__reassembly_queue",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_public__socket",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        "net/dcsctp/rx/reassembly_queue.cc",
-    ],
+    srcs: ["net/dcsctp/rx/reassembly_queue.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_packet__chunk",
-        "webrtc_packet__parameter",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rx__interleaved_reassembly_streams",
-        "webrtc_rx__traditional_reassembly_streams",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -16022,29 +5036,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_rx__traditional_reassembly_streams",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_public__socket",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "net/dcsctp/rx/traditional_reassembly_streams.cc",
-    ],
+    srcs: ["net/dcsctp/rx/traditional_reassembly_streams.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_packet__chunk",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-    ],
 }
 
 /* From target:
@@ -16064,81 +5057,11 @@ cc_library_static {
     name: "webrtc_socket__dcsctp_socket",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_public__socket",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
         "net/dcsctp/socket/callback_deferrer.cc",
         "net/dcsctp/socket/dcsctp_socket.cc",
         "net/dcsctp/socket/state_cookie.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_packet__chunk",
-        "webrtc_packet__chunk_validators",
-        "webrtc_packet__error_cause",
-        "webrtc_packet__parameter",
-        "webrtc_packet__sctp_packet",
-        "webrtc_packet__tlv_trait",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rx__data_tracker",
-        "webrtc_rx__reassembly_queue",
-        "webrtc_socket__heartbeat_handler",
-        "webrtc_socket__packet_sender",
-        "webrtc_socket__stream_reset_handler",
-        "webrtc_socket__transmission_control_block",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-        "webrtc_timer__timer",
-        "webrtc_tx__retransmission_error_counter",
-        "webrtc_tx__retransmission_queue",
-        "webrtc_tx__retransmission_timeout",
-        "webrtc_tx__rr_send_queue",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -16147,36 +5070,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_socket__heartbeat_handler",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_numeric__int128",
-        ":webrtc_public__socket",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "net/dcsctp/socket/heartbeat_handler.cc",
-    ],
+    srcs: ["net/dcsctp/socket/heartbeat_handler.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_packet__chunk",
-        "webrtc_packet__parameter",
-        "webrtc_packet__sctp_packet",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-        "webrtc_timer__timer",
-    ],
 }
 
 /* From target:
@@ -16185,33 +5080,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_socket__packet_sender",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_numeric__int128",
-        ":webrtc_public__socket",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "net/dcsctp/socket/packet_sender.cc",
-    ],
+    srcs: ["net/dcsctp/socket/packet_sender.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_packet__sctp_packet",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-        "webrtc_timer__timer",
-    ],
 }
 
 /* From target:
@@ -16220,71 +5090,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_socket__stream_reset_handler",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_public__socket",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        "net/dcsctp/socket/stream_reset_handler.cc",
-    ],
+    srcs: ["net/dcsctp/socket/stream_reset_handler.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_packet__chunk",
-        "webrtc_packet__parameter",
-        "webrtc_packet__sctp_packet",
-        "webrtc_packet__tlv_trait",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rx__data_tracker",
-        "webrtc_rx__reassembly_queue",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-        "webrtc_timer__timer",
-        "webrtc_tx__retransmission_queue",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -16293,74 +5100,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_socket__transmission_control_block",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_public__socket",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        "net/dcsctp/socket/transmission_control_block.cc",
-    ],
+    srcs: ["net/dcsctp/socket/transmission_control_block.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_packet__chunk",
-        "webrtc_packet__sctp_packet",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rx__data_tracker",
-        "webrtc_rx__reassembly_queue",
-        "webrtc_socket__heartbeat_handler",
-        "webrtc_socket__packet_sender",
-        "webrtc_socket__stream_reset_handler",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-        "webrtc_timer__timer",
-        "webrtc_tx__retransmission_error_counter",
-        "webrtc_tx__retransmission_queue",
-        "webrtc_tx__retransmission_timeout",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -16397,44 +5138,46 @@ cc_library_static {
     name: "webrtc_stats__rtc_stats",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "stats/rtc_stats.cc",
         "stats/rtc_stats_report.cc",
         "stats/rtcstats_objects.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/strings:cord
 */
-filegroup {
+cc_library_static {
     name: "webrtc_strings__cord",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "third_party/abseil-cpp/absl/strings/cord.cc",
         "third_party/abseil-cpp/absl/strings/cord_analysis.cc",
         "third_party/abseil-cpp/absl/strings/cord_buffer.cc",
     ],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/strings:cord_internal
 */
-filegroup {
+cc_library_static {
     name: "webrtc_strings__cord_internal",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "third_party/abseil-cpp/absl/strings/internal/cord_internal.cc",
         "third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.cc",
@@ -16444,49 +5187,124 @@ filegroup {
         "third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc",
         "third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc",
     ],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/strings:cordz_functions
 */
-filegroup {
+cc_library_static {
     name: "webrtc_strings__cordz_functions",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/strings:cordz_handle
 */
-filegroup {
+cc_library_static {
     name: "webrtc_strings__cordz_handle",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/strings:cordz_info
 */
-filegroup {
+cc_library_static {
     name: "webrtc_strings__cordz_info",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/strings/internal/cordz_info.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/strings:internal
 */
-filegroup {
+cc_library_static {
     name: "webrtc_strings__internal",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "third_party/abseil-cpp/absl/strings/internal/escaping.cc",
         "third_party/abseil-cpp/absl/strings/internal/ostringstream.cc",
         "third_party/abseil-cpp/absl/strings/internal/utf8.cc",
     ],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/strings:str_format_internal
 */
-filegroup {
+cc_library_static {
     name: "webrtc_strings__str_format_internal",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "third_party/abseil-cpp/absl/strings/internal/str_format/arg.cc",
         "third_party/abseil-cpp/absl/strings/internal/str_format/bind.cc",
@@ -16495,13 +5313,28 @@ filegroup {
         "third_party/abseil-cpp/absl/strings/internal/str_format/output.cc",
         "third_party/abseil-cpp/absl/strings/internal/str_format/parser.cc",
     ],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/strings:strings
 */
-filegroup {
+cc_library_static {
     name: "webrtc_strings__strings",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "third_party/abseil-cpp/absl/strings/ascii.cc",
         "third_party/abseil-cpp/absl/strings/charconv.cc",
@@ -16519,21 +5352,38 @@ filegroup {
         "third_party/abseil-cpp/absl/strings/string_view.cc",
         "third_party/abseil-cpp/absl/strings/substitute.cc",
     ],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //modules/video_coding/svc:scalability_mode_util
 */
-filegroup {
+cc_library_static {
     name: "webrtc_svc__scalability_mode_util",
+    defaults: ["webrtc_defaults"],
     srcs: ["modules/video_coding/svc/scalability_mode_util.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //modules/video_coding/svc:scalability_structures
 */
-filegroup {
+cc_library_static {
     name: "webrtc_svc__scalability_structures",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "modules/video_coding/svc/create_scalability_structure.cc",
         "modules/video_coding/svc/scalability_structure_full_svc.cc",
@@ -16541,30 +5391,50 @@ filegroup {
         "modules/video_coding/svc/scalability_structure_l2t2_key_shift.cc",
         "modules/video_coding/svc/scalability_structure_simulcast.cc",
     ],
+    host_supported: true,
 }
 
 /* From target:
 //modules/video_coding/svc:scalable_video_controller
 */
-filegroup {
+cc_library_static {
     name: "webrtc_svc__scalable_video_controller",
+    defaults: ["webrtc_defaults"],
     srcs: ["modules/video_coding/svc/scalable_video_controller_no_layering.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //modules/video_coding/svc:svc_rate_allocator
 */
-filegroup {
+cc_library_static {
     name: "webrtc_svc__svc_rate_allocator",
+    defaults: ["webrtc_defaults"],
     srcs: ["modules/video_coding/svc/svc_rate_allocator.cc"],
+    host_supported: true,
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/synchronization:graphcycles_internal
 */
-filegroup {
+cc_library_static {
     name: "webrtc_synchronization__graphcycles_internal",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
@@ -16573,33 +5443,16 @@ filegroup {
 cc_library_static {
     name: "webrtc_synchronization__sequence_checker_internal",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/synchronization/sequence_checker_internal.cc",
-    ],
+    srcs: ["rtc_base/synchronization/sequence_checker_internal.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/synchronization:synchronization
 */
-filegroup {
+cc_library_static {
     name: "webrtc_synchronization__synchronization",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "third_party/abseil-cpp/absl/synchronization/barrier.cc",
         "third_party/abseil-cpp/absl/synchronization/blocking_counter.cc",
@@ -16609,6 +5462,20 @@ filegroup {
         "third_party/abseil-cpp/absl/synchronization/mutex.cc",
         "third_party/abseil-cpp/absl/synchronization/notification.cc",
     ],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
@@ -16627,19 +5494,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_synchronization__yield_policy",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "rtc_base/synchronization/yield_policy.cc",
-    ],
+    srcs: ["rtc_base/synchronization/yield_policy.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -16648,22 +5504,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_system__file_wrapper",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "rtc_base/system/file_wrapper.cc",
-    ],
+    srcs: ["rtc_base/system/file_wrapper.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__criticalsection",
-    ],
 }
 
 /* From target:
@@ -16672,20 +5514,9 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_system_wrappers__denormal_disabler",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "system_wrappers/source/denormal_disabler.cc",
-    ],
+    srcs: ["system_wrappers/source/denormal_disabler.cc"],
     host_supported: true,
     cppflags: ["-Wno-unused-private-field"],
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -16694,27 +5525,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_system_wrappers__field_trial",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "system_wrappers/source/field_trial.cc",
-    ],
+    srcs: ["system_wrappers/source/field_trial.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -16723,25 +5535,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_system_wrappers__metrics",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "system_wrappers/source/metrics.cc",
-    ],
+    srcs: ["system_wrappers/source/metrics.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -16751,15 +5546,6 @@ cc_library_static {
     name: "webrtc_system_wrappers__system_wrappers",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "system_wrappers/source/clock.cc",
         "system_wrappers/source/cpu_features.cc",
         "system_wrappers/source/cpu_features_linux.cc",
@@ -16768,17 +5554,6 @@ cc_library_static {
         "system_wrappers/source/sleep.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -16787,27 +5562,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_task_queue__default_task_queue_factory",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/task_queue/default_task_queue_factory_libevent.cc",
-    ],
+    srcs: ["api/task_queue/default_task_queue_factory_libevent.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_task_queue_libevent",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-    ],
 }
 
 /* From target:
@@ -16816,25 +5572,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_task_queue__pending_task_safety_flag",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/task_queue/pending_task_safety_flag.cc",
-    ],
+    srcs: ["api/task_queue/pending_task_safety_flag.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -16843,23 +5582,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_task_queue__task_queue",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/task_queue/task_queue_base.cc",
-    ],
+    srcs: ["api/task_queue/task_queue_base.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -16868,33 +5592,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_task_utils__repeating_task",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "rtc_base/task_utils/repeating_task.cc",
-    ],
+    srcs: ["rtc_base/task_utils/repeating_task.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -16904,53 +5603,6 @@ cc_library_static {
     name: "webrtc_test__fake_video_codecs",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "test/configurable_frame_size_encoder.cc",
         "test/fake_decoder.cc",
         "test/fake_encoder.cc",
@@ -16958,82 +5610,14 @@ cc_library_static {
         "test/fake_vp8_encoder.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__criticalsection",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_codecs__vp8_temporal_layers_factory",
-        "webrtc_video_coding__video_codec_interface",
-        "webrtc_video_coding__video_coding_utility",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/time:time
 */
-filegroup {
+cc_library_static {
     name: "webrtc_time__time",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "third_party/abseil-cpp/absl/time/civil_time.cc",
         "third_party/abseil-cpp/absl/time/clock.cc",
@@ -17041,6 +5625,20 @@ filegroup {
         "third_party/abseil-cpp/absl/time/format.cc",
         "third_party/abseil-cpp/absl/time/time.cc",
     ],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
@@ -17049,30 +5647,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_timer__task_queue_timeout",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_public__socket",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "net/dcsctp/timer/task_queue_timeout.cc",
-    ],
+    srcs: ["net/dcsctp/timer/task_queue_timeout.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -17081,25 +5657,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_timer__timer",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_public__socket",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "net/dcsctp/timer/timer.cc",
-    ],
+    srcs: ["net/dcsctp/timer/timer.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_task_queue__task_queue",
-    ],
 }
 
 /* From target:
@@ -17108,23 +5667,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_timing__codec_timer",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/video_coding/timing/codec_timer.cc",
-    ],
+    srcs: ["modules/video_coding/timing/codec_timer.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__rtc_numerics",
-    ],
 }
 
 /* From target:
@@ -17133,24 +5677,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_timing__frame_delay_variation_kalman_filter",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/video_coding/timing/frame_delay_variation_kalman_filter.cc",
-    ],
+    srcs: ["modules/video_coding/timing/frame_delay_variation_kalman_filter.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_units__data_size",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -17159,25 +5687,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_timing__inter_frame_delay",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/video_coding/timing/inter_frame_delay.cc",
-    ],
+    srcs: ["modules/video_coding/timing/inter_frame_delay.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_units__frequency",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -17186,66 +5697,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_timing__jitter_estimator",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        "modules/video_coding/timing/jitter_estimator.cc",
-    ],
+    srcs: ["modules/video_coding/timing/jitter_estimator.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_timing__frame_delay_variation_kalman_filter",
-        "webrtc_timing__rtt_filter",
-        "webrtc_units__data_size",
-        "webrtc_units__frequency",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -17254,23 +5707,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_timing__rtt_filter",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/video_coding/timing/rtt_filter.cc",
-    ],
+    srcs: ["modules/video_coding/timing/rtt_filter.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -17279,23 +5717,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_timing__timestamp_extrapolator",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/video_coding/timing/timestamp_extrapolator.cc",
-    ],
+    srcs: ["modules/video_coding/timing/timestamp_extrapolator.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -17304,34 +5727,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_timing__timing_module",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/video_coding/timing/timing.cc",
-    ],
+    srcs: ["modules/video_coding/timing/timing.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_timing__codec_timer",
-        "webrtc_timing__timestamp_extrapolator",
-        "webrtc_units__time_delta",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-    ],
 }
 
 /* From target:
@@ -17341,15 +5738,6 @@ cc_library_static {
     name: "webrtc_transient__transient_suppressor_impl",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/transient/moving_moments.cc",
         "modules/audio_processing/transient/transient_detector.cc",
         "modules/audio_processing/transient/transient_suppressor_impl.cc",
@@ -17357,25 +5745,6 @@ cc_library_static {
         "modules/audio_processing/transient/wpd_tree.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_common_audio__common_audio",
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_common_audio__fir_filter_factory",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_256",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_transient__voice_probability_delay_unit",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -17384,19 +5753,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_transient__voice_probability_delay_unit",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "modules/audio_processing/transient/voice_probability_delay_unit.cc",
-    ],
+    srcs: ["modules/audio_processing/transient/voice_probability_delay_unit.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -17405,12 +5763,7 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_transport__bitrate_settings",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_types__bad_optional_access",
-        "api/transport/bitrate_settings.cc",
-    ],
+    srcs: ["api/transport/bitrate_settings.cc"],
     host_supported: true,
 }
 
@@ -17420,27 +5773,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_transport__field_trial_based_config",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/transport/field_trial_based_config.cc",
-    ],
+    srcs: ["api/transport/field_trial_based_config.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-    ],
 }
 
 /* From target:
@@ -17449,123 +5783,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_transport__goog_cc",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "api/transport/goog_cc_factory.cc",
-    ],
+    srcs: ["api/transport/goog_cc_factory.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_goog_cc__goog_cc",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_transport__network_control",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -17574,35 +5793,18 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_transport__network_control",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/transport/network_types.cc",
-    ],
+    srcs: ["api/transport/network_types.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_units__data_rate",
-        "webrtc_units__data_size",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
 //api/transport:stun_types
 */
-filegroup {
+cc_library_static {
     name: "webrtc_transport__stun_types",
+    defaults: ["webrtc_defaults"],
     srcs: ["api/transport/stun.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -17611,32 +5813,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_tx__outstanding_data",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_public__socket",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "net/dcsctp/tx/outstanding_data.cc",
-    ],
+    srcs: ["net/dcsctp/tx/outstanding_data.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_packet__chunk",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-        "webrtc_timer__timer",
-        "webrtc_tx__retransmission_timeout",
-    ],
 }
 
 /* From target:
@@ -17645,25 +5823,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_tx__retransmission_error_counter",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "net/dcsctp/tx/retransmission_error_counter.cc",
-    ],
+    srcs: ["net/dcsctp/tx/retransmission_error_counter.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -17672,33 +5833,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_tx__retransmission_queue",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_public__socket",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "net/dcsctp/tx/retransmission_queue.cc",
-    ],
+    srcs: ["net/dcsctp/tx/retransmission_queue.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_packet__chunk",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-        "webrtc_timer__timer",
-        "webrtc_tx__outstanding_data",
-        "webrtc_tx__retransmission_timeout",
-    ],
 }
 
 /* From target:
@@ -17707,20 +5843,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_tx__retransmission_timeout",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "net/dcsctp/tx/retransmission_timeout.cc",
-    ],
+    srcs: ["net/dcsctp/tx/retransmission_timeout.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -17729,34 +5853,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_tx__rr_send_queue",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_numeric__int128",
-        ":webrtc_public__socket",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "net/dcsctp/tx/rr_send_queue.cc",
-    ],
+    srcs: ["net/dcsctp/tx/rr_send_queue.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_packet__chunk",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-        "webrtc_tx__stream_scheduler",
-    ],
 }
 
 /* From target:
@@ -17765,50 +5863,54 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_tx__stream_scheduler",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_crc32c__crc32c",
-        ":webrtc_crc32c__crc32c_arm64",
-        ":webrtc_crc32c__crc32c_sse42",
-        ":webrtc_numeric__int128",
-        ":webrtc_public__socket",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "net/dcsctp/tx/stream_scheduler.cc",
-    ],
+    srcs: ["net/dcsctp/tx/stream_scheduler.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_packet__chunk",
-        "webrtc_packet__sctp_packet",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/types:bad_optional_access
 */
-filegroup {
+cc_library_static {
     name: "webrtc_types__bad_optional_access",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/types/bad_optional_access.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
 //third_party/abseil-cpp/absl/types:bad_variant_access
 */
-filegroup {
+cc_library_static {
     name: "webrtc_types__bad_variant_access",
+    defaults: ["webrtc_defaults"],
     srcs: ["third_party/abseil-cpp/absl/types/bad_variant_access.cc"],
+    host_supported: true,
+    cflags: ["-Wno-unused-variable"],
+    cppflags: [
+        "-Wbitfield-enum-conversion",
+        "-Wbool-conversion",
+        "-Wconstant-conversion",
+        "-Wenum-conversion",
+        "-Wint-conversion",
+        "-Wliteral-conversion",
+        "-Wnon-literal-null-conversion",
+        "-Wnull-conversion",
+        "-Wobjc-literal-conversion",
+        "-Wstring-conversion",
+    ],
 }
 
 /* From target:
@@ -17817,26 +5919,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_units__data_rate",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/units/data_rate.cc",
-    ],
+    srcs: ["api/units/data_rate.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_units__data_size",
-        "webrtc_units__frequency",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -17845,23 +5929,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_units__data_size",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/units/data_size.cc",
-    ],
+    srcs: ["api/units/data_size.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__stringutils",
-    ],
 }
 
 /* From target:
@@ -17870,24 +5939,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_units__frequency",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/units/frequency.cc",
-    ],
+    srcs: ["api/units/frequency.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -17896,23 +5949,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_units__time_delta",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/units/time_delta.cc",
-    ],
+    srcs: ["api/units/time_delta.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__stringutils",
-    ],
 }
 
 /* From target:
@@ -17921,24 +5959,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_units__timestamp",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/units/timestamp.cc",
-    ],
+    srcs: ["api/units/timestamp.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -17948,37 +5970,11 @@ cc_library_static {
     name: "webrtc_utility__audio_frame_operations",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "audio/utility/audio_frame_operations.cc",
         "audio/utility/channel_mixer.cc",
         "audio/utility/channel_mixing_matrix.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio__audio_frame_api",
-        "webrtc_common_audio__common_audio",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__system_wrappers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -17987,19 +5983,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_utility__cascaded_biquad_filter",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "modules/audio_processing/utility/cascaded_biquad_filter.cc",
-    ],
+    srcs: ["modules/audio_processing/utility/cascaded_biquad_filter.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -18009,19 +5994,10 @@ cc_library_static {
     name: "webrtc_utility__legacy_delay_estimator",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
         "modules/audio_processing/utility/delay_estimator.cc",
         "modules/audio_processing/utility/delay_estimator_wrapper.cc",
     ],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -18030,27 +6006,18 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_utility__pffft_wrapper",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "modules/audio_processing/utility/pffft_wrapper.cc",
-    ],
+    srcs: ["modules/audio_processing/utility/pffft_wrapper.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
 //modules/utility:utility
 */
-filegroup {
+cc_library_static {
     name: "webrtc_utility__utility",
+    defaults: ["webrtc_defaults"],
     srcs: ["modules/utility/maybe_worker_thread.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -18060,15 +6027,6 @@ cc_library_static {
     name: "webrtc_vad__vad",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/audio_processing/vad/gmm.cc",
         "modules/audio_processing/vad/pitch_based_vad.cc",
         "modules/audio_processing/vad/pitch_internal.cc",
@@ -18079,24 +6037,6 @@ cc_library_static {
         "modules/audio_processing/vad/voice_activity_detector.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_audio_coding__isac_vad",
-        "webrtc_common_audio__common_audio",
-        "webrtc_common_audio__common_audio_c",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_256",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_utility__audio_frame_operations",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-    },
 }
 
 /* From target:
@@ -18105,128 +6045,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video__builtin_video_bitrate_allocator_factory",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_svc__svc_rate_allocator",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "api/video/builtin_video_bitrate_allocator_factory.cc",
-    ],
+    srcs: ["api/video/builtin_video_bitrate_allocator_factory.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__stable_target_rate_experiment",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_coding_utility",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -18235,31 +6055,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video__decode_synchronizer",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "video/decode_synchronizer.cc",
-    ],
+    srcs: ["video/decode_synchronizer.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__frame_decode_timing",
-    ],
 }
 
 /* From target:
@@ -18268,64 +6065,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video__encoded_frame",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "api/video/encoded_frame.cc",
-    ],
+    srcs: ["api/video/encoded_frame.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_coding__encoded_frame",
-    ],
 }
 
 /* From target:
@@ -18334,27 +6075,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video__encoded_image",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/video/encoded_image.cc",
-    ],
+    srcs: ["api/video/encoded_image.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__rtp_packet_info",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-    ],
 }
 
 /* From target:
@@ -18363,123 +6085,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video__frame_buffer",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "api/video/frame_buffer.cc",
-    ],
+    srcs: ["api/video/frame_buffer.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_coding_utility",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -18488,39 +6095,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video__frame_cadence_adapter",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "video/frame_cadence_adapter.cc",
-    ],
+    srcs: ["video/frame_cadence_adapter.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__race_checker",
-        "webrtc_rtc_base__rate_statistics",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_task_utils__repeating_task",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__video_frame",
-    ],
 }
 
 /* From target:
@@ -18529,32 +6105,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video__frame_decode_timing",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "video/frame_decode_timing.cc",
-    ],
+    srcs: ["video/frame_decode_timing.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_timing__timing_module",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -18563,131 +6115,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video__frame_dumping_decoder",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_svc__svc_rate_allocator",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        ":webrtc_video_coding__webrtc_vp8_scalability",
-        "video/frame_dumping_decoder.cc",
-    ],
+    srcs: ["video/frame_dumping_decoder.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__stable_target_rate_experiment",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_codec_interface",
-        "webrtc_video_coding__video_coding",
-        "webrtc_video_coding__video_coding_utility",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -18696,31 +6125,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video__task_queue_frame_decode_scheduler",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "video/task_queue_frame_decode_scheduler.cc",
-    ],
+    srcs: ["video/task_queue_frame_decode_scheduler.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__timestamp",
-        "webrtc_video__frame_decode_timing",
-    ],
 }
 
 /* From target:
@@ -18740,58 +6146,6 @@ cc_library_static {
     name: "webrtc_video__video",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_svc__svc_rate_allocator",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        ":webrtc_video_coding__webrtc_vp8_scalability",
         "video/buffered_frame_decryptor.cc",
         "video/call_stats2.cc",
         "video/encoder_rtcp_feedback.cc",
@@ -18814,121 +6168,6 @@ cc_library_static {
         "video/video_stream_decoder2.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_adaptation__video_adaptation",
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_api__transport_api",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__bitrate_allocator",
-        "webrtc_call__call_interfaces",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_call__rtp_receiver",
-        "webrtc_call__rtp_sender",
-        "webrtc_call__video_stream_api",
-        "webrtc_common_video__common_video",
-        "webrtc_config__encoder_config",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_crypto__options",
-        "webrtc_experiments__alr_experiment",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_experiments__keyframe_interval_settings_experiment",
-        "webrtc_experiments__min_video_bitrate_experiment",
-        "webrtc_experiments__normalize_simulcast_size_experiment",
-        "webrtc_experiments__rate_control_settings",
-        "webrtc_experiments__stable_target_rate_experiment",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_pacing__pacing",
-        "webrtc_remote_bitrate_estimator__remote_bitrate_estimator",
-        "webrtc_render__incoming_video_stream",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__histogram_percentile_counter",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rate_statistics",
-        "webrtc_rtc_base__rate_tracker",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__sample_counter",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_rtp_rtcp__rtp_video_header",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_task_utils__repeating_task",
-        "webrtc_timing__timing_module",
-        "webrtc_transport__field_trial_based_config",
-        "webrtc_units__data_rate",
-        "webrtc_units__frequency",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__frame_cadence_adapter",
-        "webrtc_video__frame_decode_timing",
-        "webrtc_video__frame_dumping_decoder",
-        "webrtc_video__task_queue_frame_decode_scheduler",
-        "webrtc_video__unique_timestamp_counter",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video__video_stream_buffer_controller",
-        "webrtc_video__video_stream_encoder_impl",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__nack_requester",
-        "webrtc_video_coding__packet_buffer",
-        "webrtc_video_coding__video_codec_interface",
-        "webrtc_video_coding__video_coding",
-        "webrtc_video_coding__video_coding_utility",
-        "webrtc_video_coding__webrtc_vp9_helpers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -18937,23 +6176,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video__video_adaptation",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/video/video_adaptation_counters.cc",
-    ],
+    srcs: ["api/video/video_adaptation_counters.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__stringutils",
-    ],
 }
 
 /* From target:
@@ -18962,23 +6186,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video__video_bitrate_allocation",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/video/video_bitrate_allocation.cc",
-    ],
+    srcs: ["api/video/video_bitrate_allocation.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__stringutils",
-    ],
 }
 
 /* From target:
@@ -18987,24 +6196,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video__video_bitrate_allocator",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "api/video/video_bitrate_allocator.cc",
-    ],
+    srcs: ["api/video/video_bitrate_allocator.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_units__data_rate",
-        "webrtc_video__video_bitrate_allocation",
-    ],
 }
 
 /* From target:
@@ -19014,15 +6207,6 @@ cc_library_static {
     name: "webrtc_video__video_frame",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "api/video/i420_buffer.cc",
         "api/video/i422_buffer.cc",
         "api/video/i444_buffer.cc",
@@ -19032,15 +6216,6 @@ cc_library_static {
         "api/video/video_source_interface.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__rtp_packet_info",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_synchronization__yield",
-        "webrtc_video__video_rtp_headers",
-    ],
 }
 
 /* From target:
@@ -19050,68 +6225,20 @@ cc_library_static {
     name: "webrtc_video__video_frame_i010",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
         "api/video/i010_buffer.cc",
         "api/video/i210_buffer.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__time_delta",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-    ],
 }
 
 /* From target:
 //api/video:video_frame_metadata
 */
-filegroup {
+cc_library_static {
     name: "webrtc_video__video_frame_metadata",
+    defaults: ["webrtc_defaults"],
     srcs: ["api/video/video_frame_metadata.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -19120,32 +6247,8 @@ filegroup {
 cc_library_static {
     name: "webrtc_video__video_receive_stream_timeout_tracker",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "video/video_receive_stream_timeout_tracker.cc",
-    ],
+    srcs: ["video/video_receive_stream_timeout_tracker.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__task_queue",
-        "webrtc_task_utils__repeating_task",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -19155,30 +6258,12 @@ cc_library_static {
     name: "webrtc_video__video_rtp_headers",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "api/video/color_space.cc",
         "api/video/hdr_metadata.cc",
         "api/video/video_content_type.cc",
         "api/video/video_timing.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-    ],
 }
 
 /* From target:
@@ -19187,142 +6272,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video__video_stream_buffer_controller",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_svc__svc_rate_allocator",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        ":webrtc_video_coding__webrtc_vp8_scalability",
-        "video/video_stream_buffer_controller.cc",
-    ],
+    srcs: ["video/video_stream_buffer_controller.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__rtt_mult_experiment",
-        "webrtc_experiments__stable_target_rate_experiment",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_timing__inter_frame_delay",
-        "webrtc_timing__jitter_estimator",
-        "webrtc_timing__timing_module",
-        "webrtc_units__data_rate",
-        "webrtc_units__data_size",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__decode_synchronizer",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__frame_buffer",
-        "webrtc_video__frame_decode_timing",
-        "webrtc_video__task_queue_frame_decode_scheduler",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_receive_stream_timeout_tracker",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__frame_helpers",
-        "webrtc_video_coding__video_codec_interface",
-        "webrtc_video_coding__video_coding",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -19332,58 +6283,6 @@ cc_library_static {
     name: "webrtc_video__video_stream_encoder_impl",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_svc__svc_rate_allocator",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        ":webrtc_video_coding__webrtc_vp8_scalability",
         "video/alignment_adjuster.cc",
         "video/encoder_bitrate_adjuster.cc",
         "video/encoder_overshoot_detector.cc",
@@ -19392,113 +6291,21 @@ cc_library_static {
         "video/video_stream_encoder.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_adaptation__resource_adaptation",
-        "webrtc_adaptation__video_adaptation",
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_api__rtp_sender_interface",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_common_video__common_video",
-        "webrtc_config__encoder_config",
-        "webrtc_config__streams_config",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__alr_experiment",
-        "webrtc_experiments__balanced_degradation_settings",
-        "webrtc_experiments__encoder_info_settings",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_experiments__quality_rampup_experiment",
-        "webrtc_experiments__quality_scaler_settings",
-        "webrtc_experiments__quality_scaling_experiment",
-        "webrtc_experiments__rate_control_settings",
-        "webrtc_experiments__stable_target_rate_experiment",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__criticalsection",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__race_checker",
-        "webrtc_rtc_base__rate_statistics",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_task_utils__repeating_task",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__frame_cadence_adapter",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_codec_interface",
-        "webrtc_video_coding__video_coding",
-        "webrtc_video_coding__video_coding_utility",
-        "webrtc_video_coding__webrtc_vp9_helpers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
 //modules/video_capture:video_capture_internal_impl
 */
-filegroup {
+cc_library_static {
     name: "webrtc_video_capture__video_capture_internal_impl",
+    defaults: ["webrtc_defaults"],
     srcs: [
         "modules/video_capture/linux/device_info_linux.cc",
         "modules/video_capture/linux/device_info_v4l2.cc",
         "modules/video_capture/linux/video_capture_linux.cc",
         "modules/video_capture/linux/video_capture_v4l2.cc",
     ],
+    host_supported: true,
 }
 
 /* From target:
@@ -19508,125 +6315,11 @@ cc_library_static {
     name: "webrtc_video_capture__video_capture_module",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/video_capture/device_info_impl.cc",
         "modules/video_capture/video_capture_factory.cc",
         "modules/video_capture/video_capture_impl.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_common_video__common_video",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -19635,132 +6328,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video_codecs__builtin_video_decoder_factory",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_svc__svc_rate_allocator",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        ":webrtc_video_coding__webrtc_vp8_scalability",
-        "api/video_codecs/builtin_video_decoder_factory.cc",
-    ],
+    srcs: ["api/video_codecs/builtin_video_decoder_factory.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__stable_target_rate_experiment",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_media__rtc_internal_video_codecs",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__webrtc_h264",
-        "webrtc_video_coding__webrtc_vp8",
-        "webrtc_video_coding__webrtc_vp9",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -19769,134 +6338,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video_codecs__builtin_video_encoder_factory",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_svc__svc_rate_allocator",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        ":webrtc_video_coding__webrtc_vp8_scalability",
-        "api/video_codecs/builtin_video_encoder_factory.cc",
-    ],
+    srcs: ["api/video_codecs/builtin_video_encoder_factory.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__stable_target_rate_experiment",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_media__rtc_encoder_simulcast_proxy",
-        "webrtc_media__rtc_internal_video_codecs",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__webrtc_h264",
-        "webrtc_video_coding__webrtc_vp8",
-        "webrtc_video_coding__webrtc_vp9",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -19906,134 +6349,20 @@ cc_library_static {
     name: "webrtc_video_codecs__rtc_software_fallback_wrappers",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "api/video_codecs/video_decoder_software_fallback_wrapper.cc",
         "api/video_codecs/video_encoder_software_fallback_wrapper.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_codec_interface",
-        "webrtc_video_coding__video_coding_utility",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
 //api/video_codecs:scalability_mode
 */
-filegroup {
+cc_library_static {
     name: "webrtc_video_codecs__scalability_mode",
+    defaults: ["webrtc_defaults"],
     srcs: ["api/video_codecs/scalability_mode.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -20043,16 +6372,6 @@ cc_library_static {
     name: "webrtc_video_codecs__video_codecs_api",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_video_codecs__scalability_mode",
         "api/video_codecs/av1_profile.cc",
         "api/video_codecs/h264_profile_level_id.cc",
         "api/video_codecs/sdp_video_format.cc",
@@ -20066,18 +6385,6 @@ cc_library_static {
         "api/video_codecs/vp9_profile.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-    ],
 }
 
 /* From target:
@@ -20086,123 +6393,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video_codecs__vp8_temporal_layers_factory",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "api/video_codecs/vp8_temporal_layers_factory.cc",
-    ],
+    srcs: ["api/video_codecs/vp8_temporal_layers_factory.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_coding_utility",
-        "webrtc_video_coding__webrtc_vp8_temporal_layers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -20211,25 +6403,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video_coding__chain_diff_calculator",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/video_coding/chain_diff_calculator.cc",
-    ],
+    srcs: ["modules/video_coding/chain_diff_calculator.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -20238,68 +6413,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video_coding__encoded_frame",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "modules/video_coding/encoded_frame.cc",
-    ],
+    srcs: ["modules/video_coding/encoded_frame.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__alr_experiment",
-        "webrtc_experiments__rtt_mult_experiment",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtp_rtcp__rtp_video_header",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_units__time_delta",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_coding__video_codec_interface",
-    ],
 }
 
 /* From target:
@@ -20308,27 +6423,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video_coding__frame_dependencies_calculator",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
-        "modules/video_coding/frame_dependencies_calculator.cc",
-    ],
+    srcs: ["modules/video_coding/frame_dependencies_calculator.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_synchronization__yield",
-    ],
 }
 
 /* From target:
@@ -20337,64 +6433,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video_coding__frame_helpers",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "modules/video_coding/frame_helpers.cc",
-    ],
+    srcs: ["modules/video_coding/frame_helpers.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__time_delta",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-    ],
 }
 
 /* From target:
@@ -20404,35 +6444,10 @@ cc_library_static {
     name: "webrtc_video_coding__nack_requester",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        ":webrtc_types__bad_optional_access",
         "modules/video_coding/histogram.cc",
         "modules/video_coding/nack_requester.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_task_utils__repeating_task",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-    ],
 }
 
 /* From target:
@@ -20441,72 +6456,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video_coding__packet_buffer",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "modules/video_coding/packet_buffer.cc",
-    ],
+    srcs: ["modules/video_coding/packet_buffer.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_api__rtp_packet_info",
-        "webrtc_common_video__common_video",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_rtp_rtcp__rtp_video_header",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-    ],
 }
 
 /* From target:
@@ -20516,64 +6467,10 @@ cc_library_static {
     name: "webrtc_video_coding__video_codec_interface",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/video_coding/include/video_codec_interface.cc",
         "modules/video_coding/video_coding_defines.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_common_video__common_video",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_units__time_delta",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-    ],
 }
 
 /* From target:
@@ -20583,58 +6480,6 @@ cc_library_static {
     name: "webrtc_video_coding__video_coding",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_svc__svc_rate_allocator",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        ":webrtc_video_coding__webrtc_vp8_scalability",
         "modules/video_coding/decoder_database.cc",
         "modules/video_coding/fec_controller_default.cc",
         "modules/video_coding/frame_object.cc",
@@ -20653,100 +6498,6 @@ cc_library_static {
         "modules/video_coding/video_receiver2.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_av1__av1_svc_config",
-        "webrtc_base64__base64",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_common_video__common_video",
-        "webrtc_config__encoder_config",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__alr_experiment",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_experiments__min_video_bitrate_experiment",
-        "webrtc_experiments__rate_control_settings",
-        "webrtc_experiments__rtt_mult_experiment",
-        "webrtc_experiments__stable_target_rate_experiment",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_rtp_rtcp__rtp_video_header",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_task_utils__repeating_task",
-        "webrtc_timing__inter_frame_delay",
-        "webrtc_timing__jitter_estimator",
-        "webrtc_timing__rtt_filter",
-        "webrtc_timing__timing_module",
-        "webrtc_units__data_rate",
-        "webrtc_units__data_size",
-        "webrtc_units__frequency",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__builtin_video_bitrate_allocator_factory",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__encoded_frame",
-        "webrtc_video_coding__frame_helpers",
-        "webrtc_video_coding__video_codec_interface",
-        "webrtc_video_coding__video_coding_utility",
-        "webrtc_video_coding__webrtc_vp9_helpers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -20756,53 +6507,6 @@ cc_library_static {
     name: "webrtc_video_coding__video_coding_utility",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/video_coding/utility/bandwidth_quality_scaler.cc",
         "modules/video_coding/utility/decoded_frames_history.cc",
         "modules/video_coding/utility/frame_dropper.cc",
@@ -20817,85 +6521,6 @@ cc_library_static {
         "modules/video_coding/utility/vp9_uncompressed_header_parser.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_common_video__common_video",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__bandwidth_quality_scaler_settings",
-        "webrtc_experiments__encoder_info_settings",
-        "webrtc_experiments__quality_scaler_settings",
-        "webrtc_experiments__quality_scaling_experiment",
-        "webrtc_experiments__rate_control_settings",
-        "webrtc_experiments__stable_target_rate_experiment",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rate_statistics",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__weak_ptr",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_task_utils__repeating_task",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_codec_interface",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -20905,134 +6530,12 @@ cc_library_static {
     name: "webrtc_video_coding__webrtc_h264",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/video_coding/codecs/h264/h264.cc",
         "modules/video_coding/codecs/h264/h264_color_space.cc",
         "modules/video_coding/codecs/h264/h264_decoder_impl.cc",
         "modules/video_coding/codecs/h264/h264_encoder_impl.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_common_video__common_video",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_frame_i010",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_codec_interface",
-        "webrtc_video_coding__video_coding_utility",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -21041,19 +6544,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video_coding__webrtc_libvpx_interface",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_numeric__int128",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__strings",
-        "modules/video_coding/codecs/interface/libvpx_interface.cc",
-    ],
+    srcs: ["modules/video_coding/codecs/interface/libvpx_interface.cc"],
     host_supported: true,
-    static_libs: ["webrtc_rtc_base__checks"],
 }
 
 /* From target:
@@ -21063,127 +6555,12 @@ cc_library_static {
     name: "webrtc_video_coding__webrtc_multiplex",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/video_coding/codecs/multiplex/augmented_video_frame_buffer.cc",
         "modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc",
         "modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.cc",
         "modules/video_coding/codecs/multiplex/multiplex_encoder_adapter.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_common_video__common_video",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_codec_interface",
-        "webrtc_video_coding__video_coding_utility",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -21193,145 +6570,20 @@ cc_library_static {
     name: "webrtc_video_coding__webrtc_vp8",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        ":webrtc_video_coding__webrtc_vp8_scalability",
         "modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc",
         "modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_common_video__common_video",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__cpu_speed_experiment",
-        "webrtc_experiments__encoder_info_settings",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_experiments__rate_control_settings",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_codecs__vp8_temporal_layers_factory",
-        "webrtc_video_coding__video_codec_interface",
-        "webrtc_video_coding__video_coding_utility",
-        "webrtc_video_coding__webrtc_libvpx_interface",
-        "webrtc_video_coding__webrtc_vp8_temporal_layers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
 //modules/video_coding:webrtc_vp8_scalability
 */
-filegroup {
+cc_library_static {
     name: "webrtc_video_coding__webrtc_vp8_scalability",
+    defaults: ["webrtc_defaults"],
     srcs: ["modules/video_coding/codecs/vp8/vp8_scalability.cc"],
+    host_supported: true,
 }
 
 /* From target:
@@ -21341,128 +6593,11 @@ cc_library_static {
     name: "webrtc_video_coding__webrtc_vp8_temporal_layers",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/video_coding/codecs/vp8/default_temporal_layers.cc",
         "modules/video_coding/codecs/vp8/screenshare_layers.cc",
         "modules/video_coding/codecs/vp8/temporal_layers_checker.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rate_statistics",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_numerics",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_codec_interface",
-        "webrtc_video_coding__video_coding_utility",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -21472,143 +6607,12 @@ cc_library_static {
     name: "webrtc_video_coding__webrtc_vp9",
     defaults: ["webrtc_defaults"],
     srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_svc__svc_rate_allocator",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
         "modules/video_coding/codecs/vp9/libvpx_vp9_decoder.cc",
         "modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc",
         "modules/video_coding/codecs/vp9/vp9.cc",
         "modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc",
     ],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_call__rtp_interfaces",
-        "webrtc_common_video__common_video",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__encoder_info_settings",
-        "webrtc_experiments__field_trial_parser",
-        "webrtc_experiments__rate_control_settings",
-        "webrtc_experiments__stable_target_rate_experiment",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__event_tracer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__timeutils",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__field_trial",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_transport__field_trial_based_config",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_frame_i010",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_codec_interface",
-        "webrtc_video_coding__video_coding_utility",
-        "webrtc_video_coding__webrtc_libvpx_interface",
-        "webrtc_video_coding__webrtc_vp9_helpers",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 /* From target:
@@ -21617,128 +6621,8 @@ cc_library_static {
 cc_library_static {
     name: "webrtc_video_coding__webrtc_vp9_helpers",
     defaults: ["webrtc_defaults"],
-    srcs: [
-        ":webrtc_adaptation__resource_adaptation_api",
-        ":webrtc_api__field_trials_registry",
-        ":webrtc_api__wrapping_async_dns_resolver",
-        ":webrtc_audio_processing__aec_dump_interface",
-        ":webrtc_audio_processing__rms_level",
-        ":webrtc_base__base",
-        ":webrtc_base__log_severity",
-        ":webrtc_base__malloc_internal",
-        ":webrtc_base__raw_logging_internal",
-        ":webrtc_base__spinlock_wait",
-        ":webrtc_base__throw_delegate",
-        ":webrtc_cctz__civil_time",
-        ":webrtc_cctz__time_zone",
-        ":webrtc_container__hashtablez_sampler",
-        ":webrtc_container__raw_hash_set",
-        ":webrtc_debugging__debugging_internal",
-        ":webrtc_debugging__demangle_internal",
-        ":webrtc_debugging__stacktrace",
-        ":webrtc_debugging__symbolize",
-        ":webrtc_hash__city",
-        ":webrtc_hash__hash",
-        ":webrtc_hash__low_level_hash",
-        ":webrtc_neteq__neteq_api",
-        ":webrtc_numeric__int128",
-        ":webrtc_profiling__exponential_biased",
-        ":webrtc_rnn_vad__rnn_vad_layers",
-        ":webrtc_rtc_base__bitstream_reader",
-        ":webrtc_rtc_base__callback_list",
-        ":webrtc_rtc_base__network_constants",
-        ":webrtc_rtp__dependency_descriptor",
-        ":webrtc_strings__cord",
-        ":webrtc_strings__cord_internal",
-        ":webrtc_strings__cordz_functions",
-        ":webrtc_strings__cordz_handle",
-        ":webrtc_strings__cordz_info",
-        ":webrtc_strings__internal",
-        ":webrtc_strings__str_format_internal",
-        ":webrtc_strings__strings",
-        ":webrtc_svc__scalability_mode_util",
-        ":webrtc_svc__scalability_structures",
-        ":webrtc_svc__scalable_video_controller",
-        ":webrtc_synchronization__graphcycles_internal",
-        ":webrtc_synchronization__synchronization",
-        ":webrtc_time__time",
-        ":webrtc_transport__stun_types",
-        ":webrtc_types__bad_optional_access",
-        ":webrtc_types__bad_variant_access",
-        ":webrtc_utility__utility",
-        ":webrtc_video__video_frame_metadata",
-        ":webrtc_video_codecs__scalability_mode",
-        "modules/video_coding/codecs/vp9/svc_config.cc",
-    ],
+    srcs: ["modules/video_coding/codecs/vp9/svc_config.cc"],
     host_supported: true,
-    static_libs: [
-        "webrtc_agc2__cpu_features",
-        "webrtc_api__media_stream_interface",
-        "webrtc_api__rtc_error",
-        "webrtc_api__rtp_headers",
-        "webrtc_api__rtp_packet_info",
-        "webrtc_api__rtp_parameters",
-        "webrtc_audio__audio_frame_api",
-        "webrtc_audio_codecs__audio_codecs_api",
-        "webrtc_audio_device__audio_device_impl",
-        "webrtc_audio_processing__api",
-        "webrtc_audio_processing__apm_logging",
-        "webrtc_common_video__common_video",
-        "webrtc_containers__flat_containers_internal",
-        "webrtc_experiments__stable_target_rate_experiment",
-        "webrtc_generic_frame_descriptor__generic_frame_descriptor",
-        "webrtc_media__rtc_media_base",
-        "webrtc_memory__aligned_malloc",
-        "webrtc_ooura__fft_size_128",
-        "webrtc_rtc_base__async_resolver_interface",
-        "webrtc_rtc_base__byte_buffer",
-        "webrtc_rtc_base__checks",
-        "webrtc_rtc_base__copy_on_write_buffer",
-        "webrtc_rtc_base__ip_address",
-        "webrtc_rtc_base__logging",
-        "webrtc_rtc_base__platform_thread_types",
-        "webrtc_rtc_base__rtc_base",
-        "webrtc_rtc_base__rtc_event",
-        "webrtc_rtc_base__rtc_task_queue",
-        "webrtc_rtc_base__socket",
-        "webrtc_rtc_base__socket_address",
-        "webrtc_rtc_base__stringutils",
-        "webrtc_rtc_base__threading",
-        "webrtc_rtc_base__zero_memory",
-        "webrtc_rtc_event_log__rtc_event_log",
-        "webrtc_rtp_rtcp__rtp_rtcp_format",
-        "webrtc_sigslot__sigslot",
-        "webrtc_synchronization__sequence_checker_internal",
-        "webrtc_synchronization__yield",
-        "webrtc_system__file_wrapper",
-        "webrtc_system_wrappers__metrics",
-        "webrtc_system_wrappers__system_wrappers",
-        "webrtc_task_queue__pending_task_safety_flag",
-        "webrtc_task_queue__task_queue",
-        "webrtc_units__data_rate",
-        "webrtc_units__time_delta",
-        "webrtc_units__timestamp",
-        "webrtc_video__encoded_frame",
-        "webrtc_video__encoded_image",
-        "webrtc_video__video_adaptation",
-        "webrtc_video__video_bitrate_allocation",
-        "webrtc_video__video_bitrate_allocator",
-        "webrtc_video__video_frame",
-        "webrtc_video__video_rtp_headers",
-        "webrtc_video_codecs__video_codecs_api",
-        "webrtc_video_coding__video_codec_interface",
-    ],
-    arch: {
-        arm: {
-            srcs: [":webrtc_common_audio__common_audio_c_arm_asm"],
-        },
-        x86_64: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-        x86: {
-            static_libs: ["webrtc_rnn_vad__vector_math_avx2"],
-        },
-    },
 }
 
 cc_library_static {
@@ -21752,6 +6636,7 @@ cc_library_static {
         "webrtc_L16__audio_encoder_L16",
         "webrtc___webrtc",
         "webrtc_adaptation__resource_adaptation",
+        "webrtc_adaptation__resource_adaptation_api",
         "webrtc_adaptation__video_adaptation",
         "webrtc_aec3__aec3",
         "webrtc_aec_dump__null_aec_dump_factory",
@@ -21777,6 +6662,7 @@ cc_library_static {
         "webrtc_api__create_peerconnection_factory",
         "webrtc_api__dtls_transport_interface",
         "webrtc_api__field_trials",
+        "webrtc_api__field_trials_registry",
         "webrtc_api__ice_transport_factory",
         "webrtc_api__libjingle_peerconnection_api",
         "webrtc_api__media_stream_interface",
@@ -21787,6 +6673,7 @@ cc_library_static {
         "webrtc_api__rtp_parameters",
         "webrtc_api__rtp_sender_interface",
         "webrtc_api__transport_api",
+        "webrtc_api__wrapping_async_dns_resolver",
         "webrtc_async_audio_processing__async_audio_processing",
         "webrtc_audio__aec3_config",
         "webrtc_audio__aec3_factory",
@@ -21800,6 +6687,7 @@ cc_library_static {
         "webrtc_audio_coding__audio_encoder_cng",
         "webrtc_audio_coding__audio_network_adaptor",
         "webrtc_audio_coding__audio_network_adaptor_config",
+        "webrtc_audio_coding__default_neteq_factory",
         "webrtc_audio_coding__g711",
         "webrtc_audio_coding__g711_c",
         "webrtc_audio_coding__g722",
@@ -21821,6 +6709,7 @@ cc_library_static {
         "webrtc_audio_device__audio_device_impl",
         "webrtc_audio_mixer__audio_frame_manipulator",
         "webrtc_audio_mixer__audio_mixer_impl",
+        "webrtc_audio_processing__aec_dump_interface",
         "webrtc_audio_processing__api",
         "webrtc_audio_processing__apm_logging",
         "webrtc_audio_processing__audio_buffer",
@@ -21830,8 +6719,15 @@ cc_library_static {
         "webrtc_audio_processing__gain_controller2",
         "webrtc_audio_processing__high_pass_filter",
         "webrtc_audio_processing__optionally_built_submodule_creators",
+        "webrtc_audio_processing__rms_level",
         "webrtc_av1__av1_svc_config",
         "webrtc_base64__base64",
+        "webrtc_base__base",
+        "webrtc_base__log_severity",
+        "webrtc_base__malloc_internal",
+        "webrtc_base__raw_logging_internal",
+        "webrtc_base__spinlock_wait",
+        "webrtc_base__throw_delegate",
         "webrtc_call__bitrate_allocator",
         "webrtc_call__bitrate_configurator",
         "webrtc_call__call",
@@ -21844,6 +6740,8 @@ cc_library_static {
         "webrtc_call__version",
         "webrtc_call__video_stream_api",
         "webrtc_capture_levels_adjuster__capture_levels_adjuster",
+        "webrtc_cctz__civil_time",
+        "webrtc_cctz__time_zone",
         "webrtc_common_audio__common_audio",
         "webrtc_common_audio__common_audio_c",
         "webrtc_common_audio__common_audio_cc",
@@ -21852,8 +6750,17 @@ cc_library_static {
         "webrtc_config__encoder_config",
         "webrtc_config__streams_config",
         "webrtc_congestion_controller__congestion_controller",
+        "webrtc_container__hashtablez_sampler",
+        "webrtc_container__raw_hash_set",
         "webrtc_containers__flat_containers_internal",
+        "webrtc_crc32c__crc32c",
+        "webrtc_crc32c__crc32c_arm64",
+        "webrtc_crc32c__crc32c_sse42",
         "webrtc_crypto__options",
+        "webrtc_debugging__debugging_internal",
+        "webrtc_debugging__demangle_internal",
+        "webrtc_debugging__stacktrace",
+        "webrtc_debugging__symbolize",
         "webrtc_experiments__alr_experiment",
         "webrtc_experiments__balanced_degradation_settings",
         "webrtc_experiments__bandwidth_quality_scaler_settings",
@@ -21887,6 +6794,9 @@ cc_library_static {
         "webrtc_goog_cc__probe_controller",
         "webrtc_goog_cc__pushback_controller",
         "webrtc_goog_cc__send_side_bwe",
+        "webrtc_hash__city",
+        "webrtc_hash__hash",
+        "webrtc_hash__low_level_hash",
         "webrtc_ilbc__audio_decoder_ilbc",
         "webrtc_ilbc__audio_encoder_ilbc",
         "webrtc_logging__ice_log",
@@ -21914,8 +6824,12 @@ cc_library_static {
         "webrtc_metrics__metrics_accumulator",
         "webrtc_metrics__metrics_logger",
         "webrtc_metrics__stdout_metrics_exporter",
+        "webrtc_neteq__default_neteq_controller_factory",
+        "webrtc_neteq__neteq_api",
+        "webrtc_neteq__tick_timer",
         "webrtc_network__sent_packet",
         "webrtc_ns__ns",
+        "webrtc_numeric__int128",
         "webrtc_numerics__numerics",
         "webrtc_ooura__fft_size_128",
         "webrtc_ooura__fft_size_256",
@@ -21937,34 +6851,73 @@ cc_library_static {
         "webrtc_packet__tlv_trait",
         "webrtc_pc__audio_rtp_receiver",
         "webrtc_pc__audio_track",
+        "webrtc_pc__channel",
         "webrtc_pc__connection_context",
+        "webrtc_pc__data_channel_controller",
         "webrtc_pc__data_channel_utils",
+        "webrtc_pc__dtls_srtp_transport",
+        "webrtc_pc__dtls_transport",
         "webrtc_pc__dtmf_sender",
+        "webrtc_pc__external_hmac",
         "webrtc_pc__ice_server_parsing",
+        "webrtc_pc__ice_transport",
         "webrtc_pc__jitter_buffer_delay",
+        "webrtc_pc__jsep_transport",
+        "webrtc_pc__jsep_transport_collection",
+        "webrtc_pc__jsep_transport_controller",
+        "webrtc_pc__legacy_stats_collector",
+        "webrtc_pc__local_audio_source",
         "webrtc_pc__media_protocol_names",
+        "webrtc_pc__media_session",
         "webrtc_pc__media_stream",
         "webrtc_pc__media_stream_observer",
+        "webrtc_pc__peer_connection",
+        "webrtc_pc__peer_connection_factory",
         "webrtc_pc__peer_connection_message_handler",
         "webrtc_pc__proxy",
         "webrtc_pc__remote_audio_source",
+        "webrtc_pc__rtc_stats_collector",
+        "webrtc_pc__rtc_stats_traversal",
+        "webrtc_pc__rtcp_mux_filter",
+        "webrtc_pc__rtp_media_utils",
         "webrtc_pc__rtp_parameters_conversion",
         "webrtc_pc__rtp_receiver",
         "webrtc_pc__rtp_sender",
         "webrtc_pc__rtp_transceiver",
         "webrtc_pc__rtp_transmission_manager",
+        "webrtc_pc__rtp_transport",
         "webrtc_pc__sctp_data_channel",
+        "webrtc_pc__sctp_transport",
+        "webrtc_pc__sctp_utils",
+        "webrtc_pc__sdp_offer_answer",
+        "webrtc_pc__sdp_serializer",
+        "webrtc_pc__sdp_utils",
+        "webrtc_pc__session_description",
+        "webrtc_pc__simulcast_description",
+        "webrtc_pc__srtp_filter",
+        "webrtc_pc__srtp_session",
+        "webrtc_pc__srtp_transport",
+        "webrtc_pc__track_media_info_map",
         "webrtc_pc__transceiver_list",
+        "webrtc_pc__transport_stats",
         "webrtc_pc__usage_pattern",
         "webrtc_pc__video_rtp_receiver",
         "webrtc_pc__video_rtp_track_source",
         "webrtc_pc__video_track",
         "webrtc_pc__video_track_source",
+        "webrtc_pc__video_track_source_proxy",
+        "webrtc_pc__webrtc_sdp",
+        "webrtc_pc__webrtc_session_description_factory",
+        "webrtc_profiling__exponential_biased",
+        "webrtc_public__factory",
+        "webrtc_public__socket",
+        "webrtc_public__utils",
         "webrtc_remote_bitrate_estimator__remote_bitrate_estimator",
         "webrtc_render__incoming_video_stream",
         "webrtc_render__video_render_frames",
         "webrtc_rnn_vad__rnn_vad",
         "webrtc_rnn_vad__rnn_vad_auto_correlation",
+        "webrtc_rnn_vad__rnn_vad_layers",
         "webrtc_rnn_vad__rnn_vad_lp_residual",
         "webrtc_rnn_vad__rnn_vad_pitch",
         "webrtc_rnn_vad__rnn_vad_spectral_features",
@@ -21972,8 +6925,10 @@ cc_library_static {
         "webrtc_rtc_base__async_socket",
         "webrtc_rtc_base__audio_format_to_string",
         "webrtc_rtc_base__bit_buffer",
+        "webrtc_rtc_base__bitstream_reader",
         "webrtc_rtc_base__buffer_queue",
         "webrtc_rtc_base__byte_buffer",
+        "webrtc_rtc_base__callback_list",
         "webrtc_rtc_base__checks",
         "webrtc_rtc_base__copy_on_write_buffer",
         "webrtc_rtc_base__criticalsection",
@@ -21982,6 +6937,7 @@ cc_library_static {
         "webrtc_rtc_base__ip_address",
         "webrtc_rtc_base__logging",
         "webrtc_rtc_base__net_helpers",
+        "webrtc_rtc_base__network_constants",
         "webrtc_rtc_base__null_socket_server",
         "webrtc_rtc_base__platform_thread",
         "webrtc_rtc_base__platform_thread_types",
@@ -21993,6 +6949,7 @@ cc_library_static {
         "webrtc_rtc_base__rtc_base",
         "webrtc_rtc_base__rtc_event",
         "webrtc_rtc_base__rtc_numerics",
+        "webrtc_rtc_base__rtc_operations_chain",
         "webrtc_rtc_base__rtc_task_queue",
         "webrtc_rtc_base__rtc_task_queue_libevent",
         "webrtc_rtc_base__sample_counter",
@@ -22007,6 +6964,7 @@ cc_library_static {
         "webrtc_rtc_event_log__rtc_event_log",
         "webrtc_rtc_event_log__rtc_event_log_factory",
         "webrtc_rtp__control_handler",
+        "webrtc_rtp__dependency_descriptor",
         "webrtc_rtp__transport_feedback",
         "webrtc_rtp_rtcp__rtp_rtcp",
         "webrtc_rtp_rtcp__rtp_rtcp_format",
@@ -22023,7 +6981,21 @@ cc_library_static {
         "webrtc_socket__transmission_control_block",
         "webrtc_spl_sqrt_floor__spl_sqrt_floor",
         "webrtc_stats__rtc_stats",
-        "webrtc_synchronization__sequence_checker_internal",
+        "webrtc_strings__cord",
+        "webrtc_strings__cord_internal",
+        "webrtc_strings__cordz_functions",
+        "webrtc_strings__cordz_handle",
+        "webrtc_strings__cordz_info",
+        "webrtc_strings__internal",
+        "webrtc_strings__str_format_internal",
+        "webrtc_strings__strings",
+        "webrtc_svc__scalability_mode_util",
+        "webrtc_svc__scalability_structures",
+        "webrtc_svc__scalable_video_controller",
+        "webrtc_svc__svc_rate_allocator",
+        "webrtc_synchronization__graphcycles_internal",
+        "webrtc_synchronization__sequence_checker_internal",
+        "webrtc_synchronization__synchronization",
         "webrtc_synchronization__yield",
         "webrtc_synchronization__yield_policy",
         "webrtc_system__file_wrapper",
@@ -22036,6 +7008,7 @@ cc_library_static {
         "webrtc_task_queue__task_queue",
         "webrtc_task_utils__repeating_task",
         "webrtc_test__fake_video_codecs",
+        "webrtc_time__time",
         "webrtc_timer__task_queue_timeout",
         "webrtc_timer__timer",
         "webrtc_timing__codec_timer",
@@ -22051,12 +7024,15 @@ cc_library_static {
         "webrtc_transport__field_trial_based_config",
         "webrtc_transport__goog_cc",
         "webrtc_transport__network_control",
+        "webrtc_transport__stun_types",
         "webrtc_tx__outstanding_data",
         "webrtc_tx__retransmission_error_counter",
         "webrtc_tx__retransmission_queue",
         "webrtc_tx__retransmission_timeout",
         "webrtc_tx__rr_send_queue",
         "webrtc_tx__stream_scheduler",
+        "webrtc_types__bad_optional_access",
+        "webrtc_types__bad_variant_access",
         "webrtc_units__data_rate",
         "webrtc_units__data_size",
         "webrtc_units__frequency",
@@ -22066,6 +7042,7 @@ cc_library_static {
         "webrtc_utility__cascaded_biquad_filter",
         "webrtc_utility__legacy_delay_estimator",
         "webrtc_utility__pffft_wrapper",
+        "webrtc_utility__utility",
         "webrtc_vad__vad",
         "webrtc_video__builtin_video_bitrate_allocator_factory",
         "webrtc_video__decode_synchronizer",
@@ -22083,14 +7060,17 @@ cc_library_static {
         "webrtc_video__video_bitrate_allocator",
         "webrtc_video__video_frame",
         "webrtc_video__video_frame_i010",
+        "webrtc_video__video_frame_metadata",
         "webrtc_video__video_receive_stream_timeout_tracker",
         "webrtc_video__video_rtp_headers",
         "webrtc_video__video_stream_buffer_controller",
         "webrtc_video__video_stream_encoder_impl",
+        "webrtc_video_capture__video_capture_internal_impl",
         "webrtc_video_capture__video_capture_module",
         "webrtc_video_codecs__builtin_video_decoder_factory",
         "webrtc_video_codecs__builtin_video_encoder_factory",
         "webrtc_video_codecs__rtc_software_fallback_wrappers",
+        "webrtc_video_codecs__scalability_mode",
         "webrtc_video_codecs__video_codecs_api",
         "webrtc_video_codecs__vp8_temporal_layers_factory",
         "webrtc_video_coding__chain_diff_calculator",
@@ -22106,6 +7086,7 @@ cc_library_static {
         "webrtc_video_coding__webrtc_libvpx_interface",
         "webrtc_video_coding__webrtc_multiplex",
         "webrtc_video_coding__webrtc_vp8",
+        "webrtc_video_coding__webrtc_vp8_scalability",
         "webrtc_video_coding__webrtc_vp8_temporal_layers",
         "webrtc_video_coding__webrtc_vp9",
         "webrtc_video_coding__webrtc_vp9_helpers",
@@ -22113,8 +7094,14 @@ cc_library_static {
     arch: {
         arm: {
             whole_static_libs: [
+                "webrtc_common_audio__common_audio_c",
+                "webrtc_common_audio__common_audio_c_arm_asm",
+                "webrtc_common_audio__common_audio_cc",
                 "webrtc_common_audio__common_audio_neon",
                 "webrtc_common_audio__common_audio_neon_c",
+                "webrtc_memory__aligned_malloc",
+                "webrtc_ooura__fft_size_256",
+                "webrtc_spl_sqrt_floor__spl_sqrt_floor",
             ],
         },
         arm64: {
@@ -22123,6 +7110,7 @@ cc_library_static {
                 "webrtc_common_audio__common_audio_cc",
                 "webrtc_common_audio__common_audio_neon",
                 "webrtc_common_audio__common_audio_neon_c",
+                "webrtc_memory__aligned_malloc",
                 "webrtc_ooura__fft_size_256",
                 "webrtc_spl_sqrt_floor__spl_sqrt_floor",
             ],
@@ -22132,6 +7120,7 @@ cc_library_static {
                 "webrtc_aec3__aec3_avx2",
                 "webrtc_common_audio__common_audio_avx2",
                 "webrtc_common_audio__common_audio_sse2",
+                "webrtc_memory__aligned_malloc",
                 "webrtc_rnn_vad__vector_math_avx2",
             ],
         },
@@ -22140,6 +7129,7 @@ cc_library_static {
                 "webrtc_aec3__aec3_avx2",
                 "webrtc_common_audio__common_audio_avx2",
                 "webrtc_common_audio__common_audio_sse2",
+                "webrtc_memory__aligned_malloc",
                 "webrtc_rnn_vad__vector_math_avx2",
             ],
         },
@@ -22181,6 +7171,7 @@ cc_library_static {
         "webrtc_audio__aec3_config",
         "webrtc_audio__audio_frame_api",
         "webrtc_audio_coding__isac_vad",
+        "webrtc_audio_processing__aec_dump_interface",
         "webrtc_audio_processing__api",
         "webrtc_audio_processing__apm_logging",
         "webrtc_audio_processing__audio_buffer",
@@ -22190,6 +7181,12 @@ cc_library_static {
         "webrtc_audio_processing__gain_controller2",
         "webrtc_audio_processing__high_pass_filter",
         "webrtc_audio_processing__optionally_built_submodule_creators",
+        "webrtc_audio_processing__rms_level",
+        "webrtc_base__base",
+        "webrtc_base__log_severity",
+        "webrtc_base__raw_logging_internal",
+        "webrtc_base__spinlock_wait",
+        "webrtc_base__throw_delegate",
         "webrtc_capture_levels_adjuster__capture_levels_adjuster",
         "webrtc_common_audio__common_audio",
         "webrtc_common_audio__common_audio_c",
@@ -22200,10 +7197,12 @@ cc_library_static {
         "webrtc_fft__fft",
         "webrtc_memory__aligned_malloc",
         "webrtc_ns__ns",
+        "webrtc_numeric__int128",
         "webrtc_ooura__fft_size_128",
         "webrtc_ooura__fft_size_256",
         "webrtc_rnn_vad__rnn_vad",
         "webrtc_rnn_vad__rnn_vad_auto_correlation",
+        "webrtc_rnn_vad__rnn_vad_layers",
         "webrtc_rnn_vad__rnn_vad_lp_residual",
         "webrtc_rnn_vad__rnn_vad_pitch",
         "webrtc_rnn_vad__rnn_vad_spectral_features",
@@ -22219,6 +7218,8 @@ cc_library_static {
         "webrtc_rtc_base__stringutils",
         "webrtc_rtc_base__timeutils",
         "webrtc_spl_sqrt_floor__spl_sqrt_floor",
+        "webrtc_strings__internal",
+        "webrtc_strings__strings",
         "webrtc_synchronization__sequence_checker_internal",
         "webrtc_synchronization__yield",
         "webrtc_synchronization__yield_policy",
@@ -22230,6 +7231,7 @@ cc_library_static {
         "webrtc_task_queue__task_queue",
         "webrtc_transient__transient_suppressor_impl",
         "webrtc_transient__voice_probability_delay_unit",
+        "webrtc_types__bad_optional_access",
         "webrtc_units__data_rate",
         "webrtc_units__data_size",
         "webrtc_units__frequency",
@@ -22245,8 +7247,14 @@ cc_library_static {
     arch: {
         arm: {
             whole_static_libs: [
+                "webrtc_common_audio__common_audio_c",
+                "webrtc_common_audio__common_audio_c_arm_asm",
+                "webrtc_common_audio__common_audio_cc",
                 "webrtc_common_audio__common_audio_neon",
                 "webrtc_common_audio__common_audio_neon_c",
+                "webrtc_memory__aligned_malloc",
+                "webrtc_ooura__fft_size_256",
+                "webrtc_spl_sqrt_floor__spl_sqrt_floor",
             ],
         },
         arm64: {
@@ -22255,6 +7263,7 @@ cc_library_static {
                 "webrtc_common_audio__common_audio_cc",
                 "webrtc_common_audio__common_audio_neon",
                 "webrtc_common_audio__common_audio_neon_c",
+                "webrtc_memory__aligned_malloc",
                 "webrtc_ooura__fft_size_256",
                 "webrtc_spl_sqrt_floor__spl_sqrt_floor",
             ],
@@ -22264,6 +7273,7 @@ cc_library_static {
                 "webrtc_aec3__aec3_avx2",
                 "webrtc_common_audio__common_audio_avx2",
                 "webrtc_common_audio__common_audio_sse2",
+                "webrtc_memory__aligned_malloc",
                 "webrtc_rnn_vad__vector_math_avx2",
             ],
         },
@@ -22272,6 +7282,7 @@ cc_library_static {
                 "webrtc_aec3__aec3_avx2",
                 "webrtc_common_audio__common_audio_avx2",
                 "webrtc_common_audio__common_audio_sse2",
+                "webrtc_memory__aligned_malloc",
                 "webrtc_rnn_vad__vector_math_avx2",
             ],
         },
diff --git a/android_tools/generate_bp.py b/android_tools/generate_bp.py
index 52278876fe..047dd51eb0 100755
--- a/android_tools/generate_bp.py
+++ b/android_tools/generate_bp.py
@@ -10,8 +10,14 @@ PRINT_ORIGINAL_FULL = False
 IGNORED_FLAGS = [
     '-D_DEBUG',
     '-Werror',
-    '-Xclang'
-    ]
+    '-Xclang',
+    '-target-feature',
+    '+crc',
+    '+crypto',
+]
+IGNORED_DEFINES = [
+    'HAVE_ARM64_CRC32C=1'
+]
 DEFAULT_CFLAGS = [
     '-DHAVE_ARM64_CRC32C=0',
     '-DUSE_AURA=1',
@@ -82,7 +88,6 @@ def FormatNames(target):
     target['original_name'] = target['name']
     target['name'] = FormatName(target['name'])
     target['deps'] = sorted([FormatName(d) for d in target['deps']])
-    target['sources'] = list(map(lambda s: (':' + FormatName(s[1:])) if s.startswith(':') else s, target['sources']))
     return target
 
 def FilterFlags(flags, to_skip = set()):
@@ -288,24 +293,6 @@ def GenerateGroup(target):
     # PrintOrigin(target)
     pass
 
-def GenerateSourceSet(target):
-    sources = target.get('sources', [])
-    # arch is not defined for filegroups so put all the sources in the top level,
-    # the static libraries that depend on the filegroup will add it in the
-    # appropriate arch.
-    for arch in target.get('arch', {}).values():
-        sources += arch.get('sources', [])
-    if len(sources) == 0:
-        return ''
-    PrintOrigin(target)
-
-    name = target['name']
-    print('filegroup {')
-    print('    name: "{0}",'.format(name))
-    print('    srcs: {0},'.format(FormatList(sources)))
-    print('}')
-    return name
-
 def GenerateStaticLib(target, targets):
     PrintOrigin(target)
     name = target['name']
@@ -330,9 +317,6 @@ def GenerateStaticLib(target, targets):
         cflags_cc = target['cflags_cc']
         if len(cflags_cc) > 0:
             print('    cppflags: {0},'.format(FormatList(cflags_cc)))
-    static_libs = sorted([d for d in target.get('deps', []) if targets[d]['type'] == 'static_library'])
-    if len(static_libs) > 0:
-        print('    static_libs: {0},'.format(FormatList(static_libs)))
     if 'arch' in target:
         print('   arch: {')
         for arch_name in ARCHS:
@@ -351,9 +335,6 @@ def GenerateStaticLib(target, targets):
                 cflags_cc = arch['cflags_cc']
                 if len(cflags_cc) > 0:
                     print('            cppflags: {0},'.format(FormatList(cflags_cc)))
-            if 'deps' in arch:
-                  static_libs = [d for d in arch['deps'] if targets[d]['type'] == 'static_library']
-                  print('            static_libs: {0},'.format(FormatList(static_libs)))
             if 'sources' in arch:
                   sources = arch['sources']
                   print('            srcs: {0},'.format(FormatList(sources)))
@@ -373,14 +354,11 @@ def DFS(seed, targets):
             continue
         visited.add(nxt)
         stack += targets[nxt]['deps']
-        stack += [s[1:] for s in targets[nxt]['sources'] if s.startswith(':')]
         if 'arch' not in targets[nxt]:
             continue
         for arch in targets[nxt]['arch']:
             if 'deps' in arch:
                 stack += arch['deps']
-            if 'sources' in arch:
-                stack += [s[1:] for s in arch['sources'] if s.startswith(':')]
     return visited
 
 def Preprocess(project):
@@ -391,8 +369,11 @@ def Preprocess(project):
         if target['type'] == 'shared_library':
             # Don't bother creating shared libraries
             target['type'] = 'static_library'
+        if target['type'] == 'source_set':
+            # Convert source_sets to static libraires to avoid recompiling sources multiple times.
+            target['type'] = 'static_library'
         if 'defines' in target:
-            target['cflags'] = target.get('cflags', []) + ['-D{0}'.format(d) for d in target['defines']]
+            target['cflags'] = target.get('cflags', []) + ['-D{0}'.format(d) for d in target['defines'] if d not in IGNORED_DEFINES]
             target.pop('defines')
         if 'sources' not in target:
             continue
@@ -427,70 +408,35 @@ def Preprocess(project):
         # Don't depend on ignored targets
         target['deps'] = [d for d in target['deps'] if d not in ignored_targets]
 
-    # filegroups can't have dependencies, so put their dependencies in the static libraries that
-    # depend on them.
-    for target in targets.values():
-        if target['type'] == 'static_library':
-            source_sets = TransitiveDependencies(target['name'], 'source_set', targets)
-            source_sets_deps = {}
-            for a in ['global'] + ARCHS:
-                deps = set()
-                if a == 'global':
-                    for ss in [targets[n].get('deps', []) for n in source_sets[a]]:
-                        deps |= set(ss)
-                else:
-                    for ss in [targets[n].get('arch', {}).get(a, {}).get('deps') for n in source_sets[a]]:
-                        deps |= set(ss)
-                source_sets_deps[a] = deps
-            target['deps'] = sorted(set(target['deps']) | source_sets['global'] | source_sets_deps['global'])
-            for a in ARCHS:
-                deps = source_sets[a] | source_sets_deps[a]
-                if len(deps) == 0:
-                    continue
-                if 'arch' not in target:
-                    target['arch'] = {}
-                if a not in target['arch']:
-                    target['arch'][a] = {}
-                if 'deps' not in target['arch'][a]:
-                    target['arch'][a]['deps'] = []
-                deps |= set(target['arch'][a]['deps'])
-                target['arch'][a]['deps'] = sorted(deps)
-
-    # Ignore empty source sets
-    empty_sets = set()
+    # Ignore empty static libraries
+    empty_libs = set()
     for name, target in targets.items():
-        if target['type'] == 'source_set' and 'sources' not in target:
-            empty_sets.add(name)
-    for s in empty_sets:
+        if target['type'] == 'static_library' and 'sources' not in target and name != '//:webrtc':
+            empty_libs.add(name)
+    for empty_lib in empty_libs:
+        empty_lib_deps = targets[empty_lib].get('deps', [])
+        for target in targets.values():
+            target['deps'] = FlattenEmptyLibs(target['deps'], empty_lib, empty_lib_deps)
+    for s in empty_libs:
         targets.pop(s)
-    for target in targets.values():
-        target['deps'] = [d for d in target['deps'] if d not in empty_sets]
-
-    # Move source_set dependencies to the sources fields of static libs
-    for target in targets.values():
-        if 'sources' not in target:
-            target['sources'] = []
-        if target['type'] != 'static_library':
-            continue
-        source_sets = {d for d in target['deps'] if targets[d]['type'] == 'source_set'}
-        target['deps'] = sorted(list(set(target['deps']) - source_sets))
-        target['sources'] += [':' + ss for ss in source_sets]
-        target['sources'] = sorted(target['sources'])
-        if 'arch' in target:
-            for arch in target['arch'].values():
-                if 'deps' in arch:
-                    source_sets = {d for d in arch['deps'] if targets[d]['type'] == 'source_set'}
-                    if len(source_sets) == 0:
-                        continue;
-                    arch['deps'] = sorted(list(set(arch['deps']) - source_sets))
-                    arch['sources'] = sorted(arch.get('sources', []) + [':' + ss for ss in source_sets])
 
     # Select libwebrtc, libaudio_processing and its dependencies
     selected = set()
     selected |= DFS('//:webrtc', targets)
     selected |= DFS('//modules/audio_processing:audio_processing', targets)
+
     return {FormatName(n): FormatNames(targets[n]) for n in selected}
 
+def _FlattenEmptyLibs(deps, empty_lib, empty_lib_deps):
+    for x in deps:
+        if x == empty_lib:
+            yield from empty_lib_deps
+        else:
+            yield x
+
+def FlattenEmptyLibs(deps, empty_lib, empty_lib_deps):
+    return list(_FlattenEmptyLibs(deps, empty_lib, empty_lib_deps))
+
 def NonNoneFrom(l):
     for a in l:
         if a is not None:
@@ -668,8 +614,6 @@ for name, target in sorted(targets.items()):
     typ = target['type']
     if typ == 'static_library':
         GenerateStaticLib(target, targets)
-    elif typ == 'source_set':
-        GenerateSourceSet(target)
     elif typ == 'group':
         GenerateGroup(target)
     else: