From 3ecec176a82537f81a5e7b3789c49fd79f6451e1 Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Thu, 21 Jun 2018 16:34:10 +0200 Subject: [PATCH] Extract third party part of g711 codec into separate target Bug: webrtc:8366 Change-Id: I34c7ea707213e0c1a50826896da01f70c072eae5 Reviewed-on: https://webrtc-review.googlesource.com/84741 Reviewed-by: Karl Wiberg Commit-Queue: Artem Titov Cr-Commit-Position: refs/heads/master@{#23724} --- modules/audio_coding/BUILD.gn | 11 +++++++++-- modules/audio_coding/codecs/g711/g711.c | 1 - modules/audio_coding/codecs/g711/g711.h | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn index fb587c598d..c3473b7e9a 100644 --- a/modules/audio_coding/BUILD.gn +++ b/modules/audio_coding/BUILD.gn @@ -239,17 +239,24 @@ rtc_static_library("g711") { rtc_source_set("g711_c") { poisonous = [ "audio_codecs" ] sources = [ - "codecs/g711/g711.c", - "codecs/g711/g711.h", "codecs/g711/g711_interface.c", "codecs/g711/g711_interface.h", ] deps = [ + ":g711_3p", "../..:typedefs", "../..:webrtc_common", ] } +rtc_source_set("g711_3p") { + poisonous = [ "audio_codecs" ] + sources = [ + "codecs/g711/g711.c", + "codecs/g711/g711.h", + ] +} + config("g722_config") { include_dirs = [ "codecs/g722/include" ] } diff --git a/modules/audio_coding/codecs/g711/g711.c b/modules/audio_coding/codecs/g711/g711.c index 0c65764be9..46a21f4a52 100644 --- a/modules/audio_coding/codecs/g711/g711.c +++ b/modules/audio_coding/codecs/g711/g711.c @@ -21,7 +21,6 @@ */ #include "modules/audio_coding/codecs/g711/g711.h" -#include "typedefs.h" // NOLINT(build/include) /* Copied from the CCITT G.711 specification */ static const uint8_t ulaw_to_alaw_table[256] = { diff --git a/modules/audio_coding/codecs/g711/g711.h b/modules/audio_coding/codecs/g711/g711.h index 365f31b470..ac433775a7 100644 --- a/modules/audio_coding/codecs/g711/g711.h +++ b/modules/audio_coding/codecs/g711/g711.h @@ -50,7 +50,7 @@ specification by other means. extern "C" { #endif -#include "typedefs.h" // NOLINT(build/include) +#include #if defined(__i386__) /*! \brief Find the bit position of the highest set bit in a word