mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-12 21:30:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try removing RTC_PUSH_IGNORING_WUNDEF() around proto includes

Browse source 
Bug: webrtc:15623
Change-Id: Ia184993769f74d51e68a5a536d5fdde26890bcfd
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/325481
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41058}
This commit is contained in:
Björn Terelius 2023-10-31 15:44:50 +01:00 committed by WebRTC LUCI CQ
parent 766e658665
commit efeeba0864
36 changed files with 17 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
logging/BUILD.gn
View file

@ -281,7 +281,6 @@ rtc_library("rtc_event_number_encodings") {
"../rtc_base:bit_buffer",
"../rtc_base:bitstream_reader",
"../rtc_base:checks",
"../rtc_base:ignore_wundef",
"../rtc_base:macromagic",
]
absl_deps = [
@ -355,7 +354,6 @@ rtc_library("rtc_event_log_impl_encoder") {
"../rtc_base:bitstream_reader",
"../rtc_base:buffer",
"../rtc_base:checks",
"../rtc_base:ignore_wundef",
"../rtc_base:logging",
"../rtc_base:safe_conversions",
"../system_wrappers:field_trial",
@ -427,10 +425,7 @@ if (rtc_enable_protobuf) {
if (rtc_enable_protobuf) {
rtc_source_set("rtc_event_log2_proto_include") {
sources = [ "rtc_event_log/rtc_event_log2_proto_include.h" ]
deps = [
":rtc_event_log2_proto",
"../rtc_base:ignore_wundef",
]
deps = [ ":rtc_event_log2_proto" ]
}
}
@ -549,7 +544,6 @@ if (rtc_enable_protobuf) {
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
"../rtc_base:copy_on_write_buffer",
"../rtc_base:ignore_wundef",
"../rtc_base:logging",
"../rtc_base:protobuf_utils",
"../rtc_base:rtc_numerics",

3
logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc
View file

@ -53,17 +53,14 @@
#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
#include "modules/rtp_rtcp/source/rtp_packet.h"
#include "rtc_base/checks.h"
#include "rtc_base/ignore_wundef.h"
#include "rtc_base/logging.h"
// *.pb.h files are generated at build-time by the protobuf compiler.
RTC_PUSH_IGNORING_WUNDEF()
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/logging/rtc_event_log/rtc_event_log.pb.h"
#else
#include "logging/rtc_event_log/rtc_event_log.pb.h"
#endif
RTC_POP_IGNORING_WUNDEF()
namespace webrtc {

3
logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc
View file

@ -61,18 +61,15 @@
#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "modules/rtp_rtcp/source/rtp_packet.h"
#include "rtc_base/checks.h"
#include "rtc_base/ignore_wundef.h"
#include "rtc_base/logging.h"
#include "system_wrappers/include/field_trial.h"
// *.pb.h files are generated at build-time by the protobuf compiler.
RTC_PUSH_IGNORING_WUNDEF()
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/logging/rtc_event_log/rtc_event_log2.pb.h"
#else
#include "logging/rtc_event_log/rtc_event_log2.pb.h"
#endif
RTC_POP_IGNORING_WUNDEF()
using webrtc_event_logging::ToUnsigned;

4
logging/rtc_event_log/rtc_event_log2_proto_include.h
View file

@ -11,15 +11,11 @@
#ifndef LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG2_PROTO_INCLUDE_H_
#define LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG2_PROTO_INCLUDE_H_
#include "rtc_base/ignore_wundef.h"
// *.pb.h files are generated at build-time by the protobuf compiler.
RTC_PUSH_IGNORING_WUNDEF()
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/logging/rtc_event_log/rtc_event_log2.pb.h"
#else
#include "logging/rtc_event_log/rtc_event_log2.pb.h"
#endif
RTC_POP_IGNORING_WUNDEF()
#endif // LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG2_PROTO_INCLUDE_H_

3
logging/rtc_event_log/rtc_event_log_parser.h
View file

@ -54,10 +54,8 @@
#include "logging/rtc_event_log/events/rtc_event_video_send_stream_config.h"
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h"
#include "rtc_base/ignore_wundef.h"
// Files generated at build-time by the protobuf compiler.
RTC_PUSH_IGNORING_WUNDEF()
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/logging/rtc_event_log/rtc_event_log.pb.h"
#include "external/webrtc/webrtc/logging/rtc_event_log/rtc_event_log2.pb.h"
@ -65,7 +63,6 @@ RTC_PUSH_IGNORING_WUNDEF()
#include "logging/rtc_event_log/rtc_event_log.pb.h"
#include "logging/rtc_event_log/rtc_event_log2.pb.h"
#endif
RTC_POP_IGNORING_WUNDEF()
namespace webrtc {

1
media/BUILD.gn
View file

@ -513,7 +513,6 @@ rtc_library("rtc_audio_video") {
"../rtc_base:copy_on_write_buffer",
"../rtc_base:dscp",
"../rtc_base:event_tracer",
"../rtc_base:ignore_wundef",
"../rtc_base:logging",
"../rtc_base:macromagic",
"../rtc_base:network_route",

4
media/engine/webrtc_voice_engine.cc
View file

@ -66,7 +66,6 @@
#include "rtc_base/checks.h"
#include "rtc_base/dscp.h"
#include "rtc_base/experiments/struct_parameters_parser.h"
#include "rtc_base/ignore_wundef.h"
#include "rtc_base/logging.h"
#include "rtc_base/race_checker.h"
#include "rtc_base/string_encode.h"
@ -79,13 +78,12 @@
#include "system_wrappers/include/metrics.h"
#if WEBRTC_ENABLE_PROTOBUF
RTC_PUSH_IGNORING_WUNDEF()
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h"
#else
#include "modules/audio_coding/audio_network_adaptor/config.pb.h"
#endif
RTC_POP_IGNORING_WUNDEF()
#endif
namespace cricket {

3
modules/audio_coding/BUILD.gn
View file

@ -618,7 +618,6 @@ rtc_library("audio_network_adaptor") {
"../../common_audio",
"../../logging:rtc_event_audio",
"../../rtc_base:checks",
"../../rtc_base:ignore_wundef",
"../../rtc_base:logging",
"../../rtc_base:protobuf_utils",
"../../rtc_base:safe_conversions",
@ -957,7 +956,6 @@ rtc_library("audio_coding_modules_tests_shared") {
"../../api/audio_codecs:builtin_audio_encoder_factory",
"../../api/neteq:neteq_api",
"../../rtc_base:checks",
"../../rtc_base:ignore_wundef",
"../../rtc_base:ssl",
"../../rtc_base:stringutils",
"../../system_wrappers",
@ -1717,7 +1715,6 @@ if (rtc_include_tests) {
"../../logging:rtc_event_audio",
"../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:checks",
"../../rtc_base:ignore_wundef",
"../../rtc_base:macromagic",
"../../rtc_base:platform_thread",
"../../rtc_base:refcount",

4
modules/audio_coding/audio_network_adaptor/controller_manager.cc
View file

@ -24,18 +24,16 @@
#include "modules/audio_coding/audio_network_adaptor/frame_length_controller.h"
#include "modules/audio_coding/audio_network_adaptor/frame_length_controller_v2.h"
#include "modules/audio_coding/audio_network_adaptor/util/threshold_curve.h"
#include "rtc_base/ignore_wundef.h"
#include "rtc_base/logging.h"
#include "rtc_base/time_utils.h"
#if WEBRTC_ENABLE_PROTOBUF
RTC_PUSH_IGNORING_WUNDEF()
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h"
#else
#include "modules/audio_coding/audio_network_adaptor/config.pb.h"
#endif
RTC_POP_IGNORING_WUNDEF()
#endif
namespace webrtc {

3
modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
View file

@ -17,17 +17,14 @@
#include "modules/audio_coding/audio_network_adaptor/mock/mock_controller.h"
#include "modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h"
#include "rtc_base/fake_clock.h"
#include "rtc_base/ignore_wundef.h"
#include "test/gtest.h"
#if WEBRTC_ENABLE_PROTOBUF
RTC_PUSH_IGNORING_WUNDEF()
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h"
#else
#include "modules/audio_coding/audio_network_adaptor/config.pb.h"
#endif
RTC_POP_IGNORING_WUNDEF()
#endif
namespace webrtc {

3
modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc
View file

@ -14,18 +14,15 @@
#include "absl/types/optional.h"
#include "rtc_base/checks.h"
#include "rtc_base/ignore_wundef.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/system/file_wrapper.h"
#if WEBRTC_ENABLE_PROTOBUF
RTC_PUSH_IGNORING_WUNDEF()
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump.pb.h"
#else
#include "modules/audio_coding/audio_network_adaptor/debug_dump.pb.h"
#endif
RTC_POP_IGNORING_WUNDEF()
#endif
namespace webrtc {

4
modules/audio_coding/audio_network_adaptor/debug_dump_writer.h
View file

@ -15,16 +15,14 @@
#include "modules/audio_coding/audio_network_adaptor/controller.h"
#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
#include "rtc_base/ignore_wundef.h"
#include "rtc_base/system/file_wrapper.h"
#if WEBRTC_ENABLE_PROTOBUF
RTC_PUSH_IGNORING_WUNDEF()
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h"
#else
#include "modules/audio_coding/audio_network_adaptor/config.pb.h"
#endif
RTC_POP_IGNORING_WUNDEF()
#endif
namespace webrtc {

1
modules/audio_coding/neteq/neteq_unittest.cc
View file

@ -31,7 +31,6 @@
#include "modules/include/module_common_types_public.h"
#include "modules/rtp_rtcp/include/rtcp_statistics.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "rtc_base/ignore_wundef.h"
#include "rtc_base/message_digest.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/strings/string_builder.h"

4
modules/audio_coding/neteq/test/neteq_decoding_test.cc
View file

@ -19,13 +19,13 @@
#include "test/testsupport/file_utils.h"
#ifdef WEBRTC_NETEQ_UNITTEST_BITEXACT
RTC_PUSH_IGNORING_WUNDEF()
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/modules/audio_coding/neteq/neteq_unittest.pb.h"
#else
#include "modules/audio_coding/neteq/neteq_unittest.pb.h"
#endif
RTC_POP_IGNORING_WUNDEF()
#endif
namespace webrtc {

5
modules/audio_coding/neteq/test/result_sink.cc
View file

@ -13,19 +13,18 @@
#include <string>
#include "absl/strings/string_view.h"
#include "rtc_base/ignore_wundef.h"
#include "rtc_base/message_digest.h"
#include "rtc_base/string_encode.h"
#include "test/gtest.h"
#ifdef WEBRTC_NETEQ_UNITTEST_BITEXACT
RTC_PUSH_IGNORING_WUNDEF()
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/modules/audio_coding/neteq/neteq_unittest.pb.h"
#else
#include "modules/audio_coding/neteq/neteq_unittest.pb.h"
#endif
RTC_POP_IGNORING_WUNDEF()
#endif
namespace webrtc {

1
modules/audio_device/BUILD.gn
View file

@ -481,7 +481,6 @@ if (rtc_include_tests && !build_with_chromium) {
"../../common_audio",
"../../rtc_base:buffer",
"../../rtc_base:checks",
"../../rtc_base:ignore_wundef",
"../../rtc_base:logging",
"../../rtc_base:macromagic",
"../../rtc_base:race_checker",

4
modules/audio_processing/BUILD.gn
View file

@ -190,7 +190,6 @@ rtc_library("audio_processing") {
"../../rtc_base:checks",
"../../rtc_base:event_tracer",
"../../rtc_base:gtest_prod",
"../../rtc_base:ignore_wundef",
"../../rtc_base:logging",
"../../rtc_base:macromagic",
"../../rtc_base:safe_minmax",
@ -397,7 +396,6 @@ if (rtc_include_tests) {
"../../common_audio:common_audio_c",
"../../rtc_base:checks",
"../../rtc_base:gtest_prod",
"../../rtc_base:ignore_wundef",
"../../rtc_base:macromagic",
"../../rtc_base:platform_thread",
"../../rtc_base:protobuf_utils",
@ -573,7 +571,6 @@ if (rtc_include_tests) {
"../../api/audio:echo_detector_creator",
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:ignore_wundef",
"../../rtc_base:logging",
"../../rtc_base:protobuf_utils",
"../../rtc_base:rtc_json",
@ -613,7 +610,6 @@ if (rtc_include_tests) {
deps = [
":audioproc_debug_proto",
"../../rtc_base:checks",
"../../rtc_base:ignore_wundef",
"../../rtc_base:protobuf_utils",
"../../rtc_base/system:arch",
]

1
modules/audio_processing/aec_dump/BUILD.gn
View file

@ -66,7 +66,6 @@ if (rtc_enable_protobuf) {
"../../../api/audio:audio_frame_api",
"../../../api/task_queue",
"../../../rtc_base:checks",
"../../../rtc_base:ignore_wundef",
"../../../rtc_base:logging",
"../../../rtc_base:macromagic",
"../../../rtc_base:protobuf_utils",

3
modules/audio_processing/aec_dump/aec_dump_impl.h
View file

@ -17,20 +17,17 @@
#include "modules/audio_processing/aec_dump/capture_stream_info.h"
#include "modules/audio_processing/include/aec_dump.h"
#include "rtc_base/ignore_wundef.h"
#include "rtc_base/race_checker.h"
#include "rtc_base/system/file_wrapper.h"
#include "rtc_base/task_queue.h"
#include "rtc_base/thread_annotations.h"
// Files generated at build-time by the protobuf compiler.
RTC_PUSH_IGNORING_WUNDEF()
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h"
#else
#include "modules/audio_processing/debug.pb.h"
#endif
RTC_POP_IGNORING_WUNDEF()
namespace webrtc {

3
modules/audio_processing/aec_dump/capture_stream_info.h
View file

@ -15,16 +15,13 @@
#include <utility>
#include "modules/audio_processing/include/aec_dump.h"
#include "rtc_base/ignore_wundef.h"
// Files generated at build-time by the protobuf compiler.
RTC_PUSH_IGNORING_WUNDEF()
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h"
#else
#include "modules/audio_processing/debug.pb.h"
#endif
RTC_POP_IGNORING_WUNDEF()
namespace webrtc {

1
modules/audio_processing/audio_processing_impl.h
View file

@ -43,7 +43,6 @@
#include "modules/audio_processing/rms_level.h"
#include "modules/audio_processing/transient/transient_suppressor.h"
#include "rtc_base/gtest_prod_util.h"
#include "rtc_base/ignore_wundef.h"
#include "rtc_base/swap_queue.h"
#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/thread_annotations.h"

6
modules/audio_processing/audio_processing_unittest.cc
View file

@ -38,7 +38,6 @@
#include "rtc_base/checks.h"
#include "rtc_base/fake_clock.h"
#include "rtc_base/gtest_prod_util.h"
#include "rtc_base/ignore_wundef.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/numerics/safe_minmax.h"
#include "rtc_base/protobuf_utils.h"
@ -51,14 +50,13 @@
#include "test/gtest.h"
#include "test/testsupport/file_utils.h"
RTC_PUSH_IGNORING_WUNDEF()
#include "modules/audio_processing/debug.pb.h"
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h"
#include "external/webrtc/webrtc/modules/audio_processing/test/unittest.pb.h"
#else
#include "modules/audio_processing/debug.pb.h"
#include "modules/audio_processing/test/unittest.pb.h"
#endif
RTC_POP_IGNORING_WUNDEF()
ABSL_FLAG(bool,
write_apm_ref_data,

3
modules/audio_processing/test/aec_dump_based_simulator.h
View file

@ -15,15 +15,12 @@
#include <string>
#include "modules/audio_processing/test/audio_processing_simulator.h"
#include "rtc_base/ignore_wundef.h"
RTC_PUSH_IGNORING_WUNDEF()
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h"
#else
#include "modules/audio_processing/debug.pb.h"
#endif
RTC_POP_IGNORING_WUNDEF()
namespace webrtc {
namespace test {

4
modules/audio_processing/test/debug_dump_replayer.h
View file

@ -16,11 +16,9 @@
#include "absl/strings/string_view.h"
#include "common_audio/channel_buffer.h"
#include "modules/audio_processing/include/audio_processing.h"
#include "rtc_base/ignore_wundef.h"
RTC_PUSH_IGNORING_WUNDEF()
// Generated at build-time by the protobuf compiler.
#include "modules/audio_processing/debug.pb.h"
RTC_POP_IGNORING_WUNDEF()
namespace webrtc {
namespace test {

4
modules/audio_processing/test/protobuf_utils.h
View file

@ -14,12 +14,10 @@
#include <memory>
#include <sstream> // no-presubmit-check TODO(webrtc:8982)
#include "rtc_base/ignore_wundef.h"
#include "rtc_base/protobuf_utils.h"
RTC_PUSH_IGNORING_WUNDEF()
// Generated at build-time by the protobuf compiler.
#include "modules/audio_processing/debug.pb.h"
RTC_POP_IGNORING_WUNDEF()
namespace webrtc {

1
modules/video_coding/BUILD.gn
View file

@ -757,7 +757,6 @@ if (rtc_include_tests) {
"../../api/video_codecs:video_codecs_api",
"../../modules/utility:utility",
"../../rtc_base:checks",
"../../rtc_base:ignore_wundef",
"../../sdk/android:internal_jni",
"../../sdk/android:native_api_base",
"../../sdk/android:native_api_codecs",

2
rtc_tools/BUILD.gn
View file

@ -420,7 +420,6 @@ if (!build_with_chromium) {
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
"../rtc_base:ignore_wundef",
"../rtc_base:logging",
"../rtc_base:macromagic",
"../rtc_base:rate_statistics",
@ -659,7 +658,6 @@ if (rtc_include_tests) {
"../modules/audio_processing:audioproc_debug_proto",
"../modules/audio_processing:audioproc_protobuf_utils",
"../rtc_base:checks",
"../rtc_base:ignore_wundef",
"../rtc_base:macromagic",
"../rtc_base:protobuf_utils",
"../rtc_base:stringutils",

1
rtc_tools/network_tester/BUILD.gn
View file

@ -46,7 +46,6 @@ if (rtc_enable_protobuf) {
"../../p2p:rtc_p2p",
"../../rtc_base:async_packet_socket",
"../../rtc_base:checks",
"../../rtc_base:ignore_wundef",
"../../rtc_base:ip_address",
"../../rtc_base:logging",
"../../rtc_base:macromagic",

3
rtc_tools/network_tester/config_reader.h
View file

@ -15,12 +15,9 @@
#include <string>
#include "absl/types/optional.h"
#include "rtc_base/ignore_wundef.h"
#ifdef WEBRTC_NETWORK_TESTER_PROTO
RTC_PUSH_IGNORING_WUNDEF()
#include "rtc_tools/network_tester/network_tester_config.pb.h"
RTC_POP_IGNORING_WUNDEF()
using webrtc::network_tester::config::NetworkTesterAllConfigs;
#else
class NetworkTesterConfigs;

4
rtc_tools/network_tester/packet_logger.h
View file

@ -14,12 +14,8 @@
#include <fstream>
#include <string>
#include "rtc_base/ignore_wundef.h"
#ifdef WEBRTC_NETWORK_TESTER_PROTO
RTC_PUSH_IGNORING_WUNDEF()
#include "rtc_tools/network_tester/network_tester_packet.pb.h"
RTC_POP_IGNORING_WUNDEF()
using webrtc::network_tester::packet::NetworkTesterPacket;
#else
class NetworkTesterPacket;

3
rtc_tools/network_tester/packet_sender.h
View file

@ -17,13 +17,10 @@
#include "api/sequence_checker.h"
#include "api/task_queue/pending_task_safety_flag.h"
#include "api/task_queue/task_queue_factory.h"
#include "rtc_base/ignore_wundef.h"
#include "rtc_base/system/no_unique_address.h"
#ifdef WEBRTC_NETWORK_TESTER_PROTO
RTC_PUSH_IGNORING_WUNDEF()
#include "rtc_tools/network_tester/network_tester_packet.pb.h"
RTC_POP_IGNORING_WUNDEF()
using webrtc::network_tester::packet::NetworkTesterPacket;
#else
class NetworkTesterPacket;

3
rtc_tools/network_tester/test_controller.h
View file

@ -22,7 +22,6 @@
#include "api/sequence_checker.h"
#include "p2p/base/basic_packet_socket_factory.h"
#include "rtc_base/async_packet_socket.h"
#include "rtc_base/ignore_wundef.h"
#include "rtc_base/socket_address.h"
#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/system/no_unique_address.h"
@ -32,9 +31,7 @@
#include "rtc_tools/network_tester/packet_sender.h"
#ifdef WEBRTC_NETWORK_TESTER_PROTO
RTC_PUSH_IGNORING_WUNDEF()
#include "rtc_tools/network_tester/network_tester_packet.pb.h"
RTC_POP_IGNORING_WUNDEF()
using webrtc::network_tester::packet::NetworkTesterPacket;
#else
class NetworkTesterPacket;

4
rtc_tools/rtc_event_log_visualizer/plot_base.h
View file

@ -19,11 +19,9 @@
#include "absl/base/attributes.h"
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
#include "rtc_base/ignore_wundef.h"
RTC_PUSH_IGNORING_WUNDEF()
// Generated at build-time by the protobuf compiler.
#include "rtc_tools/rtc_event_log_visualizer/proto/chart.pb.h"
RTC_POP_IGNORING_WUNDEF()
namespace webrtc {

7
rtc_tools/rtc_event_log_visualizer/plot_protobuf.h
View file

@ -11,12 +11,11 @@
#define RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
#include "absl/base/attributes.h"
#include "rtc_base/ignore_wundef.h"
RTC_PUSH_IGNORING_WUNDEF()
#include "rtc_tools/rtc_event_log_visualizer/proto/chart.pb.h"
RTC_POP_IGNORING_WUNDEF()
#include "rtc_tools/rtc_event_log_visualizer/plot_base.h"
// Generated at build-time by the protobuf compiler.
#include "rtc_tools/rtc_event_log_visualizer/proto/chart.pb.h"
namespace webrtc {
class ProtobufPlot final : public Plot {

4
rtc_tools/unpack_aecdump/unpack.cc
View file

@ -29,13 +29,11 @@
#include "common_audio/wav_file.h"
#include "modules/audio_processing/test/protobuf_utils.h"
#include "rtc_base/checks.h"
#include "rtc_base/ignore_wundef.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/system/arch.h"
RTC_PUSH_IGNORING_WUNDEF()
// Generated at build-time by the protobuf compiler.
#include "modules/audio_processing/debug.pb.h"
RTC_POP_IGNORING_WUNDEF()
ABSL_FLAG(std::string,
input_file,

2
test/scenario/audio_stream.cc
View file

@ -14,13 +14,11 @@
#include "test/video_test_constants.h"
#if WEBRTC_ENABLE_PROTOBUF
RTC_PUSH_IGNORING_WUNDEF()
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h"
#else
#include "modules/audio_coding/audio_network_adaptor/config.pb.h"
#endif
RTC_POP_IGNORING_WUNDEF()
#endif
namespace webrtc {