Loosening the coupling between WebRTC and //third_party/protobuf

webrtc/modules/audio_processing/BUILD.gn

 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import("//build/config/arm.gni")
 import("//third_party/protobuf/proto_library.gni")
@@ skipping 232 matching lines @@
   } else {
     defines += [ "WEBRTC_APM_DEBUG_DUMP=0" ]
   }
 
   if (aec_untrusted_delay_for_testing) {
     defines += [ "WEBRTC_UNTRUSTED_DELAY" ]
   }
 
   if (rtc_enable_protobuf) {
     defines += [ "WEBRTC_AUDIOPROC_DEBUG_DUMP" ]
-    deps += [ ":audioproc_debug_proto" ]
+    deps += [
+      ":audioproc_debug_proto",
+      "../../base:protobuf_utils",
+    ]
   }
 
   if (rtc_enable_intelligibility_enhancer) {
     defines += [ "WEBRTC_INTELLIGIBILITY_ENHANCER=1" ]
     sources += [
       "intelligibility/intelligibility_enhancer.cc",
       "intelligibility/intelligibility_enhancer.h",
       "intelligibility/intelligibility_utils.cc",
       "intelligibility/intelligibility_utils.h",
     ]
@@ skipping 292 matching lines @@
     } else {
       defines += [ "WEBRTC_AUDIOPROC_FLOAT_PROFILE" ]
     }
 
     if (rtc_enable_protobuf) {
       defines += [ "WEBRTC_AUDIOPROC_DEBUG_DUMP" ]
       deps += [
         ":audioproc_debug_proto",
         ":audioproc_protobuf_utils",
         ":audioproc_unittest_proto",
+        "../../base:protobuf_utils",
       ]
       sources += [
         "aec3/adaptive_fir_filter_unittest.cc",
         "aec3/aec3_fft_unittest.cc",
         "aec3/aec_state_unittest.cc",
         "aec3/block_framer_unittest.cc",
         "aec3/block_processor_metrics_unittest.cc",
         "aec3/block_processor_unittest.cc",
         "aec3/cascaded_biquad_filter_unittest.cc",
         "aec3/comfort_noise_generator_unittest.cc",
@@ skipping 73 matching lines @@
     sources = [
       "audio_processing_performance_unittest.cc",
       "level_controller/level_controller_complexity_unittest.cc",
       "residual_echo_detector_complexity_unittest.cc",
     ]
     deps = [
       ":audio_processing",
       ":audioproc_test_utils",
       "//testing/gtest",
     ]
+
+    if (rtc_enable_protobuf) {
+      deps += [ "../../base:protobuf_utils" ]
+    }
+
     if (rtc_enable_intelligibility_enhancer) {
       defines = [ "WEBRTC_INTELLIGIBILITY_ENHANCER=1" ]
     } else {
       defines = [ "WEBRTC_INTELLIGIBILITY_ENHANCER=0" ]
     }
   }
 
   if (rtc_enable_protobuf) {
     rtc_executable("unpack_aecdump") {
       testonly = true
       sources = [
         "test/unpack.cc",
       ]
 
       deps = [
         ":audio_processing",
         ":audioproc_debug_proto",
         ":audioproc_protobuf_utils",
         ":audioproc_test_utils",
         "../..:webrtc_common",
+        "../../base:protobuf_utils",
         "../../base:rtc_base_approved",
         "../../common_audio",
         "../../system_wrappers:system_wrappers_default",
         "//third_party/gflags:gflags",
       ]
     }  # unpack_aecdump
 
     rtc_executable("audioproc_f") {
       testonly = true
       sources = [
         "test/aec_dump_based_simulator.cc",
         "test/aec_dump_based_simulator.h",
         "test/audio_processing_simulator.cc",
         "test/audio_processing_simulator.h",
         "test/audioproc_float.cc",
         "test/wav_based_simulator.cc",
         "test/wav_based_simulator.h",
       ]
 
       deps = [
         ":audio_processing",
         ":audioproc_debug_proto",
         ":audioproc_protobuf_utils",
         ":audioproc_test_utils",
+        "../../base:protobuf_utils",
         "../../base:rtc_base_approved",
         "../../common_audio:common_audio",
         "../../system_wrappers",
         "../../system_wrappers:system_wrappers_default",
         "../../test:test_support",
         "//testing/gtest",
         "//third_party/gflags:gflags",
       ]
     }  # audioproc_f
   }
@@ skipping 95 matching lines @@
 
     rtc_static_library("audioproc_protobuf_utils") {
       sources = [
         "test/protobuf_utils.cc",
         "test/protobuf_utils.h",
       ]
 
       deps = [
         ":audioproc_debug_proto",
         "../..:webrtc_common",
+        "../../base:protobuf_utils",
         "../../base:rtc_base_approved",
       ]
     }
   }
 }