From 104ad0b62bc67762eff5cc7cdf437cf9392e3d49 Mon Sep 17 00:00:00 2001 From: Fredrik Solenberg Date: Wed, 18 Apr 2018 15:59:43 +0200 Subject: [PATCH] Remove stale dependencies from APM static lib target: - protobuf library - file_wrapper.h These appear to have been left behind during the AecDump refactoring. After this CL, APM no longer depends on zlib by default! :) Bug: webrtc:9139 Change-Id: I12a8df2a17a575515b9c07165825f0879c4e15eb Reviewed-on: https://webrtc-review.googlesource.com/70762 Reviewed-by: Henrik Lundin Reviewed-by: Alex Loiko Commit-Queue: Fredrik Solenberg Cr-Commit-Position: refs/heads/master@{#22923} --- audio/utility/BUILD.gn | 1 - modules/audio_processing/BUILD.gn | 7 ------- modules/audio_processing/audio_processing_impl.cc | 1 - modules/audio_processing/audio_processing_impl.h | 2 -- 4 files changed, 11 deletions(-) diff --git a/audio/utility/BUILD.gn b/audio/utility/BUILD.gn index 1572469629..fe39b7f1a0 100644 --- a/audio/utility/BUILD.gn +++ b/audio/utility/BUILD.gn @@ -24,7 +24,6 @@ rtc_static_library("audio_frame_operations") { "../..:webrtc_common", "../../:typedefs", "../../api/audio:audio_frame_api", - "../../modules/audio_coding:audio_format_conversion", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", ] diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn index f58a04f91e..38ff7a9cba 100644 --- a/modules/audio_processing/BUILD.gn +++ b/modules/audio_processing/BUILD.gn @@ -134,10 +134,8 @@ rtc_static_library("audio_processing") { "../../rtc_base:checks", "../../rtc_base:deprecation", "../../rtc_base:gtest_prod", - "../../rtc_base:protobuf_utils", "../../rtc_base:safe_minmax", "../../rtc_base:sanitizer", - "../../rtc_base/system:file_wrapper", "../../system_wrappers:cpu_features_api", "../../system_wrappers:field_trial_api", "../../system_wrappers:metrics_api", @@ -151,11 +149,6 @@ rtc_static_library("audio_processing") { defines += [ "WEBRTC_UNTRUSTED_DELAY" ] } - if (rtc_enable_protobuf) { - defines += [ "WEBRTC_AUDIOPROC_DEBUG_DUMP" ] - deps += [ ":audioproc_debug_proto" ] - } - if (rtc_enable_intelligibility_enhancer) { defines += [ "WEBRTC_INTELLIGIBILITY_ENHANCER=1" ] sources += [ diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc index 99163525ed..0077c598ae 100644 --- a/modules/audio_processing/audio_processing_impl.cc +++ b/modules/audio_processing/audio_processing_impl.cc @@ -45,7 +45,6 @@ #include "modules/audio_processing/transient/transient_suppressor.h" #include "modules/audio_processing/voice_detection_impl.h" #include "rtc_base/atomicops.h" -#include "rtc_base/system/file_wrapper.h" #include "system_wrappers/include/metrics.h" // Check to verify that the define for the intelligibility enhancer is properly diff --git a/modules/audio_processing/audio_processing_impl.h b/modules/audio_processing/audio_processing_impl.h index 7da6e75ac5..ff563b8226 100644 --- a/modules/audio_processing/audio_processing_impl.h +++ b/modules/audio_processing/audio_processing_impl.h @@ -24,9 +24,7 @@ #include "rtc_base/function_view.h" #include "rtc_base/gtest_prod_util.h" #include "rtc_base/ignore_wundef.h" -#include "rtc_base/protobuf_utils.h" #include "rtc_base/swap_queue.h" -#include "rtc_base/system/file_wrapper.h" #include "rtc_base/thread_annotations.h" namespace webrtc {