From 3af0cd8de2de74b87bd041fd247ad11acb3be47d Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Sat, 23 Nov 2019 08:41:42 +0000 Subject: [PATCH] Revert "Make webrtc_fuzzer_main depend on webrtc_component in Chromium." This reverts commit 2148e9a931ea1a8a2ac0bfffd56e12370f8bf18c. Reason for revert: Breaks linux-libfuzzer-asan-rel, https://ci.chromium.org/p/chromium/builders/try/linux-libfuzzer-asan-rel/326226. I will export symbols in this CL when relanding. Original change's description: > Make webrtc_fuzzer_main depend on webrtc_component in Chromium. > > This is needed in order to land [1] and restrict visibility of some > //third_party/webrtc_overrides targets. > > [1] - https://chromium-review.googlesource.com/c/chromium/src/+/1930801 > > Bug: chromium:896154 > Change-Id: Ie71c44ee9a0203a85d77a1199acdcb8581dfb71b > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/160308 > Reviewed-by: Karl Wiberg > Commit-Queue: Mirko Bonadei > Cr-Commit-Position: refs/heads/master@{#29875} TBR=mbonadei@webrtc.org,kwiberg@webrtc.org Change-Id: I1000e90e687d01c29a9ec4a3c8ded646b97fcaab No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:896154 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/160400 Reviewed-by: Mirko Bonadei Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#29885} --- test/fuzzers/BUILD.gn | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn index deb4fcc050..a063d6a62c 100644 --- a/test/fuzzers/BUILD.gn +++ b/test/fuzzers/BUILD.gn @@ -15,12 +15,17 @@ rtc_library("webrtc_fuzzer_main") { "webrtc_fuzzer_main.cc", ] deps = [ + "../../rtc_base:rtc_base_approved", "//testing/libfuzzer:libfuzzer_main", ] + + # When WebRTC fuzzer tests are built on Chromium bots they need to link + # with Chromium's implementation of metrics and field trial. if (build_with_chromium) { - deps += [ "//third_party/webrtc_overrides:webrtc_component" ] - } else { - deps += [ "../../rtc_base:rtc_base_approved" ] + deps += [ + "../../../webrtc_overrides:field_trial", + "../../../webrtc_overrides:metrics", + ] } }