From 9ae585de8db1041cb1903ba317c83f8f4da9d8e0 Mon Sep 17 00:00:00 2001 From: aleloi Date: Thu, 13 Oct 2016 06:57:16 -0700 Subject: [PATCH] Cleanup of voice_engine includes. I added a few missing dependencies to the GN target of voice_engine while doing other unrelated work. Currently GN's header include checker has the following to say: $ gn check out/gn_debug webrtc/voice_engine ERROR at //webrtc/voice_engine/include/voe_network.h:38:11: Include not allowed. #include "webrtc/transport.h" ^----------------- It is not in any dependency of //webrtc/voice_engine:voice_engine The include file is in the target(s): //webrtc:webrtc which should somehow be reachable. transport.h should probably move in to webrtc/api, since it is already a pure virtual interface and is used in quite a few places. BUG=webrtc:5589 NOTRY=True Review-Url: https://codereview.webrtc.org/2421483002 Cr-Commit-Position: refs/heads/master@{#14633} --- webrtc/voice_engine/BUILD.gn | 3 +++ webrtc/voice_engine/voice_engine.gyp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/webrtc/voice_engine/BUILD.gn b/webrtc/voice_engine/BUILD.gn index 0b6bb783b5..9b6fe0cfed 100644 --- a/webrtc/voice_engine/BUILD.gn +++ b/webrtc/voice_engine/BUILD.gn @@ -92,6 +92,9 @@ rtc_static_library("voice_engine") { "../base:rtc_base_approved", "../common_audio", "../logging:rtc_event_log_api", + "../modules/audio_coding:audio_decoder_factory_interface", + "../modules/audio_coding:builtin_audio_decoder_factory", + "../modules/audio_coding:rent_a_codec", "../modules/audio_conference_mixer", "../modules/audio_device", "../modules/audio_processing", diff --git a/webrtc/voice_engine/voice_engine.gyp b/webrtc/voice_engine/voice_engine.gyp index f27db2f9ec..3521a8d662 100644 --- a/webrtc/voice_engine/voice_engine.gyp +++ b/webrtc/voice_engine/voice_engine.gyp @@ -21,11 +21,14 @@ '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', '<(webrtc_root)/modules/modules.gyp:audio_coding_module', '<(webrtc_root)/modules/modules.gyp:audio_conference_mixer', + '<(webrtc_root)/modules/modules.gyp:audio_decoder_factory_interface', '<(webrtc_root)/modules/modules.gyp:audio_device', '<(webrtc_root)/modules/modules.gyp:audio_processing', '<(webrtc_root)/modules/modules.gyp:bitrate_controller', + '<(webrtc_root)/modules/modules.gyp:builtin_audio_decoder_factory', '<(webrtc_root)/modules/modules.gyp:media_file', '<(webrtc_root)/modules/modules.gyp:paced_sender', + '<(webrtc_root)/modules/modules.gyp:rent_a_codec', '<(webrtc_root)/modules/modules.gyp:rtp_rtcp', '<(webrtc_root)/modules/modules.gyp:webrtc_utility', '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',