Loosening the coupling between WebRTC and //third_party/protobuf

webrtc/modules/audio_coding/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("../../webrtc.gni")
 import("audio_coding.gni")
@@ skipping 830 matching lines @@
   if (rtc_opus_variable_complexity) {
     defines += [ "WEBRTC_OPUS_VARIABLE_COMPLEXITY=1" ]
   } else {
     defines += [ "WEBRTC_OPUS_VARIABLE_COMPLEXITY=0" ]
   }
 
   if (rtc_build_opus) {
     public_deps += [ rtc_opus_dir ]
   } else if (build_with_mozilla) {
     include_dirs = [ getenv("DIST") + "/include/opus" ]
+
+    # TODO(mbonadei): this is an hack. Remove and fix the dependency error
+    include_dirs += [ "//third_party/protobuf/src" ]

[kjellander_webrtc, 2017/03/14 21:28:05]

We should avoid adding include_dirs whenever we can and inherit them by adding
the right dependencies instead. See previous comment.

[mbonadei, 2017/03/15 10:08:05]

Done.

   }
+  include_dirs = [ "//third_party/protobuf/src" ]
 }
 
 rtc_source_set("webrtc_opus_c") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   sources = [
     "codecs/opus/opus_inst.h",
     "codecs/opus/opus_interface.c",
     "codecs/opus/opus_interface.h",
   ]
 
@@ skipping 49 matching lines @@
     "audio_network_adaptor/event_log_writer.h",
     "audio_network_adaptor/fec_controller.cc",
     "audio_network_adaptor/fec_controller.h",
     "audio_network_adaptor/frame_length_controller.cc",
     "audio_network_adaptor/frame_length_controller.h",
     "audio_network_adaptor/include/audio_network_adaptor.h",
   ]
 
   deps = [
     "../..:webrtc_common",
+    "../../base:protobuf_utils",
     "../../base:rtc_base_approved",
     "../../common_audio",
     "../../logging:rtc_event_log_api",
     "../../system_wrappers",
   ]
 
   if (rtc_enable_protobuf) {
     deps += [
       ":ana_config_proto",
       ":ana_debug_dump_proto",
@@ skipping 1140 matching lines @@
       ":neteq",
       ":neteq_test_support",
       ":neteq_unittest_tools",
       ":pcm16b",
       ":red",
       ":rent_a_codec",
       ":webrtc_opus",
       "../..:webrtc_common",
       "../../api/audio_codecs:audio_codecs_api",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
+      "../../base:protobuf_utils",
       "../../base:rtc_base",
       "../../base:rtc_base_approved",
       "../../base:rtc_base_tests_utils",
       "../../common_audio",
       "../../system_wrappers:system_wrappers",
       "../../test:field_trial",
       "../../test:rtp_test_utils",
       "../../test:test_common",
       "../../test:test_support",
       "//testing/gmock",
@@ skipping 37 matching lines @@
 # webrtc/api/audio_codecs:builtin_audio_decoder_factory instead.
 # TODO(kwiberg): Remove this.
 rtc_source_set("builtin_audio_decoder_factory") {
   sources = [
     "codecs/builtin_audio_decoder_factory.h",
   ]
   deps = [
     "../../api/audio_codecs:builtin_audio_decoder_factory",
   ]
 }