From 91280e4d0402478f0d8b89a6a59071309bf03320 Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Thu, 21 Jun 2018 16:39:37 +0200 Subject: [PATCH] Extract third party part of g722 codec into separate target Bug: webrtc:8366 Change-Id: I7e08aa53424afd3001f4c22be270a8b0ff7af565 Reviewed-on: https://webrtc-review.googlesource.com/84744 Reviewed-by: Karl Wiberg Commit-Queue: Artem Titov Cr-Commit-Position: refs/heads/master@{#23725} --- modules/audio_coding/BUILD.gn | 13 ++++++++++--- modules/audio_coding/codecs/g722/g722_decode.c | 1 - modules/audio_coding/codecs/g722/g722_enc_dec.h | 2 +- modules/audio_coding/codecs/g722/g722_encode.c | 1 - 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn index c3473b7e9a..fa4954980f 100644 --- a/modules/audio_coding/BUILD.gn +++ b/modules/audio_coding/BUILD.gn @@ -289,18 +289,25 @@ rtc_static_library("g722") { rtc_source_set("g722_c") { poisonous = [ "audio_codecs" ] sources = [ - "codecs/g722/g722_decode.c", - "codecs/g722/g722_enc_dec.h", - "codecs/g722/g722_encode.c", "codecs/g722/g722_interface.c", "codecs/g722/g722_interface.h", ] deps = [ + ":g722_3p", "../..:typedefs", "../..:webrtc_common", ] } +rtc_source_set("g722_3p") { + poisonous = [ "audio_codecs" ] + sources = [ + "codecs/g722/g722_decode.c", + "codecs/g722/g722_enc_dec.h", + "codecs/g722/g722_encode.c", + ] +} + config("ilbc_config") { include_dirs = [ "codecs/ilbc/include" ] } diff --git a/modules/audio_coding/codecs/g722/g722_decode.c b/modules/audio_coding/codecs/g722/g722_decode.c index 06b3485ac3..d638f50f74 100644 --- a/modules/audio_coding/codecs/g722/g722_decode.c +++ b/modules/audio_coding/codecs/g722/g722_decode.c @@ -35,7 +35,6 @@ #include #include "modules/audio_coding/codecs/g722/g722_enc_dec.h" -#include "typedefs.h" // NOLINT(build/include) #if !defined(FALSE) #define FALSE 0 diff --git a/modules/audio_coding/codecs/g722/g722_enc_dec.h b/modules/audio_coding/codecs/g722/g722_enc_dec.h index 24f238d4d5..cc3aa98187 100644 --- a/modules/audio_coding/codecs/g722/g722_enc_dec.h +++ b/modules/audio_coding/codecs/g722/g722_enc_dec.h @@ -30,7 +30,7 @@ #if !defined(_G722_ENC_DEC_H_) #define _G722_ENC_DEC_H_ -#include "typedefs.h" // NOLINT(build/include) +#include /*! \page g722_page G.722 encoding and decoding \section g722_page_sec_1 What does it do? diff --git a/modules/audio_coding/codecs/g722/g722_encode.c b/modules/audio_coding/codecs/g722/g722_encode.c index eeb764944f..cd19252eef 100644 --- a/modules/audio_coding/codecs/g722/g722_encode.c +++ b/modules/audio_coding/codecs/g722/g722_encode.c @@ -35,7 +35,6 @@ #include #include "modules/audio_coding/codecs/g722/g722_enc_dec.h" -#include "typedefs.h" // NOLINT(build/include) #if !defined(FALSE) #define FALSE 0