From 5a25ab298d2305044f2b3c33976a2144446e0d42 Mon Sep 17 00:00:00 2001 From: Edward Lemur Date: Tue, 2 Jan 2018 18:26:40 +0000 Subject: [PATCH] Revert "Add mock_rtc_event_log.h." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 63aea46a6e424c35f7df1ec6e702c5eeb704996a. Reason for revert: Breaks Chromium build: https://logs.chromium.org/v/?s=chromium%2Fbb%2Fchromium.webrtc.fyi%2Fios-simulator%2F6721%2F%2B%2Frecipes%2Fsteps%2Fgenerate_build_files__mb_%2F0%2Fstdout ERROR at //third_party/webrtc/logging/BUILD.gn:295:5: Can't load input file. "../../test:test_support", ^------------------------ Unable to load: /b/build/slave/mac64/build/src/third_party/test/BUILD.gn I also checked in the secondary tree for: /b/build/slave/mac64/build/src/build/secondary/third_party/test/BUILD.gn Maybe this should be guarded by an "if (!build_with_chromium)"? Original change's description: > Add mock_rtc_event_log.h. > > Bug: webrtc:7642 > Change-Id: Id3aa84d79e5e1a0520a968117cee550c9dd33c16 > Reviewed-on: https://webrtc-review.googlesource.com/37040 > Commit-Queue: Patrik Höglund > Reviewed-by: Mirko Bonadei > Cr-Commit-Position: refs/heads/master@{#21475} TBR=phoglund@webrtc.org,mbonadei@webrtc.org Change-Id: Ib49c7812261c46226ec0b7b3c99af2c3a8b78add No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:7642 Reviewed-on: https://webrtc-review.googlesource.com/36981 Reviewed-by: Edward Lemur Commit-Queue: Edward Lemur Cr-Commit-Position: refs/heads/master@{#21477} --- audio/BUILD.gn | 1 - logging/BUILD.gn | 12 ------------ modules/audio_coding/BUILD.gn | 1 - modules/bitrate_controller/BUILD.gn | 1 - modules/congestion_controller/BUILD.gn | 1 - modules/remote_bitrate_estimator/BUILD.gn | 1 - modules/rtp_rtcp/BUILD.gn | 1 - 7 files changed, 18 deletions(-) diff --git a/audio/BUILD.gn b/audio/BUILD.gn index 0fd0ac8746..c6de08ffb4 100644 --- a/audio/BUILD.gn +++ b/audio/BUILD.gn @@ -105,7 +105,6 @@ if (rtc_include_tests) { "../call:mock_rtp_interfaces", "../call:rtp_interfaces", "../call:rtp_receiver", - "../logging:mocks", "../modules/audio_device:mock_audio_device", "../modules/audio_mixer:audio_mixer_impl", "../modules/audio_processing:audio_processing_statistics", diff --git a/logging/BUILD.gn b/logging/BUILD.gn index 7c74a43f52..5bf99da2a6 100644 --- a/logging/BUILD.gn +++ b/logging/BUILD.gn @@ -235,7 +235,6 @@ if (rtc_enable_protobuf) { } } } - if (rtc_include_tests) { rtc_executable("rtc_event_log2text") { testonly = true @@ -284,14 +283,3 @@ if (rtc_enable_protobuf) { } } } - -rtc_source_set("mocks") { - testonly = true - sources = [ - "rtc_event_log/mock/mock_rtc_event_log.h", - ] - deps = [ - ":rtc_event_log_api", - "../../test:test_support", - ] -} diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn index 53043d978c..7012dff368 100644 --- a/modules/audio_coding/BUILD.gn +++ b/modules/audio_coding/BUILD.gn @@ -2150,7 +2150,6 @@ if (rtc_include_tests) { "../../api/audio_codecs/opus:audio_encoder_opus", "../../common_audio", "../../common_audio:mock_common_audio", - "../../logging:mocks", "../../logging:rtc_event_log_api", "../../rtc_base:checks", "../../rtc_base:protobuf_utils", diff --git a/modules/bitrate_controller/BUILD.gn b/modules/bitrate_controller/BUILD.gn index f50341dbd2..267211efa2 100644 --- a/modules/bitrate_controller/BUILD.gn +++ b/modules/bitrate_controller/BUILD.gn @@ -64,7 +64,6 @@ if (rtc_include_tests) { ] deps = [ ":bitrate_controller", - "../../logging:mocks", "../../logging:rtc_event_log_api", "../../test:field_trial", "../../test:test_support", diff --git a/modules/congestion_controller/BUILD.gn b/modules/congestion_controller/BUILD.gn index d3e2b0e62b..df6599f3c9 100644 --- a/modules/congestion_controller/BUILD.gn +++ b/modules/congestion_controller/BUILD.gn @@ -90,7 +90,6 @@ if (rtc_include_tests) { deps = [ ":congestion_controller", ":mock_congestion_controller", - "../../logging:mocks", "../../rtc_base:checks", "../../rtc_base:rtc_base", "../../rtc_base:rtc_base_approved", diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn index ef7ee11242..a5dd014e24 100644 --- a/modules/remote_bitrate_estimator/BUILD.gn +++ b/modules/remote_bitrate_estimator/BUILD.gn @@ -143,7 +143,6 @@ if (rtc_include_tests) { "../..:webrtc_common", "../../:typedefs", "../../api:optional", - "../../logging:mocks", "../../rtc_base:checks", "../../rtc_base:gtest_prod", "../../rtc_base:rtc_base", diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn index f07ff1adc8..efa36a12b2 100644 --- a/modules/rtp_rtcp/BUILD.gn +++ b/modules/rtp_rtcp/BUILD.gn @@ -412,7 +412,6 @@ if (rtc_include_tests) { "../../api:video_frame_api", "../../call:rtp_receiver", "../../common_video:common_video", - "../../logging:mocks", "../../logging:rtc_event_log_api", "../../rtc_base:checks", "../../rtc_base:rate_limiter",