Revert of Enabling 'gn check' on //webrtc/test. (patchset #3 id:90001 of https://codereview.webrtc.org/2815103005/ )
Reason for revert:
Breaks Chromium because in Chromium we import WebRTC with rtc_include_tests=false (https://bugs.chromium.org/p/chromium/issues/detail?id=713179#c6).
Chromium uses webrtc/test/fuzzers and this CL adds test dependencies to neteq_rtc_fuzzer.
Original issue's description:
> Reland of Enabling 'gn check' on //webrtc/test. (patchset #1 id:1 of https://codereview.webrtc.org/2817003002/ )
>
> Reason for revert:
> The original CL was breaking a downstream buildbot: https://build.chromium.org/p/client.webrtc/builders/Linux64%20Release%20%28Libfuzzer%29/builds/5429
>
> This CL fixes some dependencies in: webrtc/test/fuzzers/BUILD.gn
> (PS #2 and PS #3).
>
> BUG=webrtc:6828
>
> Original issue's description:
> > Revert of Enabling 'gn check' on //webrtc/test. (patchset #10 id:180001 of https://codereview.webrtc.org/2796363003/ )
> >
> > Reason for revert:
> > It is breaking a downstream bot.
> >
> > Original issue's description:
> > > Enabling 'gn check' on //webrtc/test.
> > >
> > > BUG=webrtc:6828
> > > NOTRY=True
> > >
> > > Review-Url: https://codereview.webrtc.org/2796363003
> > > Cr-Commit-Position: refs/heads/master@{#17689}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/b41445858e23fb757e5e10ac5631aa80e9e5eea9
> >
> > TBR=kjellander@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:6828
> >
> > Review-Url: https://codereview.webrtc.org/2817003002
> > Cr-Commit-Position: refs/heads/master@{#17690}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/8a24f47bad6eebb0fba10c3bbdb9556e43e19379
>
> Review-Url: https://codereview.webrtc.org/2815103005
> Cr-Commit-Position: refs/heads/master@{#17758}
> Committed: https://chromium.googlesource.com/external/webrtc/+/6f27633f47d0192f7cb04852be0988013e6c19dd
TBR=kjellander@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:6828
NOTRY=True
Review-Url: https://codereview.webrtc.org/2842533002
Cr-Commit-Position: refs/heads/master@{#17851}
diff --git a/.gn b/.gn
index f8a113a..7d80aa6 100644
--- a/.gn
+++ b/.gn
@@ -37,7 +37,6 @@
"//webrtc/stats/*",
"//webrtc/system_wrappers/*",
"//webrtc/tools/*",
- "//webrtc/test/*",
"//webrtc/voice_engine/*",
]
diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn
index e76ff03..36f3ba2 100644
--- a/webrtc/test/BUILD.gn
+++ b/webrtc/test/BUILD.gn
@@ -53,13 +53,9 @@
}
deps = [
- "..:webrtc_common",
- "../base:rtc_base_approved",
- "../base:rtc_task_queue",
"../common_video",
"../media:rtc_media_base",
"../modules/video_capture:video_capture_module",
- "../system_wrappers",
]
}
@@ -81,7 +77,6 @@
deps = [
"..:webrtc_common",
- "../base:rtc_base_approved",
"../modules/rtp_rtcp",
"//testing/gtest",
]
@@ -112,7 +107,6 @@
]
deps = [
":field_trial",
- "../base:rtc_base_approved",
"../system_wrappers:metrics_default",
"//testing/gmock",
"//testing/gtest",
@@ -130,16 +124,6 @@
sources += [ "testsupport/iosfileutils.mm" ]
}
visibility = [ ":*" ]
- deps = [
- "..:webrtc_common",
- "../base:rtc_base_approved",
- ]
- if (is_ios) {
- deps += [ "../sdk:rtc_sdk_common_objc" ]
- }
- if (is_win) {
- deps += [ "../base:rtc_base" ]
- }
}
rtc_source_set("video_test_support") {
@@ -158,9 +142,6 @@
]
deps = [
- ":test_support",
- ":video_test_common",
- "..:webrtc_common",
"../base:rtc_base_approved",
"../common_video",
"../system_wrappers",
@@ -209,7 +190,6 @@
]
deps = [
- "..:webrtc_common",
"../base:gtest_prod",
"../base:rtc_base_approved",
"../common_video",
@@ -315,20 +295,12 @@
deps += [
":direct_transport",
- ":fake_audio_device",
":fileutils_unittests",
- ":rtp_test_utils",
":test_common",
":test_main",
":video_test_common",
":video_test_support",
- "../api:video_frame_api",
- "../base:rtc_base_approved",
- "../call:call_interfaces",
- "../common_audio",
- "../modules/rtp_rtcp",
"../modules/video_capture",
- "../system_wrappers",
"//testing/gmock",
"//testing/gtest",
"//third_party/gflags",
@@ -341,7 +313,6 @@
]
deps = [
":fileutils",
- ":test_support",
"//testing/gmock",
"//testing/gtest",
]
@@ -360,12 +331,9 @@
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
deps = [
- "..:webrtc_common",
"../api:transport_api",
"../base:rtc_base_approved",
"../call",
- "../modules/rtp_rtcp",
- "../system_wrappers",
]
}
@@ -380,11 +348,8 @@
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
deps = [
- "..:webrtc_common",
"../base:rtc_base_approved",
- "../common_audio",
- "../modules/audio_device",
- "../system_wrappers",
+ "../modules/audio_device:audio_device",
]
}
@@ -437,25 +402,13 @@
":test_support",
":video_test_common",
"..:webrtc_common",
- "../api:transport_api",
- "../api:video_frame_api",
- "../api/audio_codecs:builtin_audio_decoder_factory",
"../api/video_codecs:video_codecs_api",
"../audio",
"../base:rtc_base_approved",
- "../base:rtc_task_queue",
"../call",
- "../logging:rtc_event_log_api",
- "../modules/audio_device:mock_audio_device",
"../modules/audio_mixer:audio_mixer_impl",
"../modules/audio_processing",
- "../modules/rtp_rtcp:rtp_rtcp",
- "../modules/video_coding:webrtc_h264",
- "../modules/video_coding:webrtc_vp8",
- "../modules/video_coding:webrtc_vp9",
- "../system_wrappers",
"../video",
- "../voice_engine",
"//testing/gmock",
"//testing/gtest",
]
@@ -531,9 +484,6 @@
deps = [
":test_support",
- "..:webrtc_common",
- "../base:rtc_base_approved",
- "../common_video",
"../modules/media_file",
"//testing/gtest",
]
@@ -545,10 +495,4 @@
"mock_audio_decoder.h",
"mock_audio_decoder_factory.h",
]
- deps = [
- ":test_support",
- "../api/audio_codecs:audio_codecs_api",
- "../api/audio_codecs:builtin_audio_decoder_factory",
- "../base:rtc_base_approved",
- ]
}
diff --git a/webrtc/test/fuzzers/BUILD.gn b/webrtc/test/fuzzers/BUILD.gn
index ed84e48..031ed8b 100644
--- a/webrtc/test/fuzzers/BUILD.gn
+++ b/webrtc/test/fuzzers/BUILD.gn
@@ -15,7 +15,6 @@
"webrtc_fuzzer_main.cc",
]
deps = [
- "../../base:rtc_base_approved",
"../../system_wrappers:field_trial_default",
"../../system_wrappers:metrics_default",
"//testing/libfuzzer:libfuzzer_main",
@@ -65,7 +64,6 @@
"vp8_qp_parser_fuzzer.cc",
]
deps = [
- "../../modules/video_coding:video_coding_utility",
"../../modules/video_coding/",
]
}
@@ -75,7 +73,6 @@
"h264_bitstream_parser_fuzzer.cc",
]
deps = [
- "../../common_video",
"../../modules/video_coding/",
]
}
@@ -85,8 +82,7 @@
"flexfec_header_reader_fuzzer.cc",
]
deps = [
- "../../base:rtc_base_approved",
- "../../modules/rtp_rtcp",
+ "../../modules/rtp_rtcp/",
]
}
@@ -95,8 +91,7 @@
"flexfec_sender_fuzzer.cc",
]
deps = [
- "../../modules/rtp_rtcp",
- "../../system_wrappers",
+ "../../modules/rtp_rtcp/",
]
libfuzzer_options = [ "max_len=200" ]
}
@@ -106,8 +101,7 @@
"ulpfec_header_reader_fuzzer.cc",
]
deps = [
- "../../base:rtc_base_approved",
- "../../modules/rtp_rtcp",
+ "../../modules/rtp_rtcp/",
]
}
@@ -116,9 +110,7 @@
"ulpfec_generator_fuzzer.cc",
]
deps = [
- "../../base:rtc_base_approved",
- "../../modules/rtp_rtcp",
- "../../modules/rtp_rtcp:rtp_rtcp_unittests",
+ "../../modules/rtp_rtcp/",
]
}
@@ -127,8 +119,7 @@
"flexfec_receiver_fuzzer.cc",
]
deps = [
- "../../base:rtc_base_approved",
- "../../modules/rtp_rtcp",
+ "../../modules/rtp_rtcp/",
]
libfuzzer_options = [ "max_len=2000" ]
}
@@ -138,8 +129,7 @@
"packet_buffer_fuzzer.cc",
]
deps = [
- "../../modules/video_coding",
- "../../system_wrappers",
+ "../../modules/video_coding/",
]
libfuzzer_options = [ "max_len=2000" ]
}
@@ -149,9 +139,7 @@
"rtcp_receiver_fuzzer.cc",
]
deps = [
- "../../base:rtc_base_approved",
- "../../modules/rtp_rtcp",
- "../../system_wrappers",
+ "../../modules/rtp_rtcp/",
]
seed_corpus = "corpora/rtcp-corpus"
}
@@ -161,7 +149,7 @@
"rtp_packet_fuzzer.cc",
]
deps = [
- "../../modules/rtp_rtcp",
+ "../../modules/rtp_rtcp/",
]
seed_corpus = "corpora/rtp-corpus"
}
@@ -171,7 +159,7 @@
"rtp_header_fuzzer.cc",
]
deps = [
- "../../modules/rtp_rtcp",
+ "../../modules/rtp_rtcp/",
]
}
@@ -180,11 +168,8 @@
"congestion_controller_feedback_fuzzer.cc",
]
deps = [
- "../../logging:rtc_event_log_api",
"../../logging:rtc_event_log_impl",
- "../../modules/congestion_controller",
- "../../modules/remote_bitrate_estimator",
- "../../modules/rtp_rtcp",
+ "../../modules/congestion_controller/",
]
}
@@ -193,12 +178,6 @@
"audio_decoder_fuzzer.cc",
"audio_decoder_fuzzer.h",
]
- deps = [
- "../..:webrtc_common",
- "../../api/audio_codecs:audio_codecs_api",
- "../../base:rtc_base_approved",
- "../../modules/rtp_rtcp",
- ]
}
webrtc_fuzzer_test("audio_decoder_ilbc_fuzzer") {
@@ -275,10 +254,8 @@
"neteq_rtp_fuzzer.cc",
]
deps = [
- "../../base:rtc_base_approved",
"../../modules/audio_coding:neteq",
"../../modules/audio_coding:neteq_test_minimal",
- "../../modules/audio_coding:neteq_unittest_tools",
"../../modules/audio_coding:pcm16b",
"../../modules/rtp_rtcp",
]
@@ -321,7 +298,6 @@
"pseudotcp_parser_fuzzer.cc",
]
deps = [
- "../../base:rtc_base",
"../../p2p:rtc_p2p",
]
}
@@ -331,7 +307,6 @@
"transport_feedback_packet_loss_tracker_fuzzer.cc",
]
deps = [
- "../../base:rtc_base_approved",
"../../modules/rtp_rtcp",
"../../voice_engine",
]
