From bc3b7828139c41923a38e21c61ed1e29733e9e7f Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Thu, 1 Feb 2018 14:30:53 +0100 Subject: [PATCH] Using fully qualified #include paths in g722 code. WebRTC internal code should always use include paths that start from the root of the project and that clearly identify the header file. This allows 'gn check' to actually keep dependencies under control because 'gn check' cannot enforce anything if the include path is not fully qualified (starting from the root of the project). Bug: webrtc:8815 Change-Id: I1fc4cb50d81522a486888a626d4a95df7847d591 Reviewed-on: https://webrtc-review.googlesource.com/46743 Reviewed-by: Karl Wiberg Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#21849} --- modules/audio_coding/codecs/g722/g722_decode.c | 2 +- modules/audio_coding/codecs/g722/g722_encode.c | 2 +- modules/audio_coding/codecs/g722/g722_interface.c | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/audio_coding/codecs/g722/g722_decode.c b/modules/audio_coding/codecs/g722/g722_decode.c index 84af155097..06b3485ac3 100644 --- a/modules/audio_coding/codecs/g722/g722_decode.c +++ b/modules/audio_coding/codecs/g722/g722_decode.c @@ -34,7 +34,7 @@ #include #include -#include "g722_enc_dec.h" +#include "modules/audio_coding/codecs/g722/g722_enc_dec.h" #include "typedefs.h" // NOLINT(build/include) #if !defined(FALSE) diff --git a/modules/audio_coding/codecs/g722/g722_encode.c b/modules/audio_coding/codecs/g722/g722_encode.c index ed4b1c85ee..eeb764944f 100644 --- a/modules/audio_coding/codecs/g722/g722_encode.c +++ b/modules/audio_coding/codecs/g722/g722_encode.c @@ -34,7 +34,7 @@ #include #include -#include "g722_enc_dec.h" +#include "modules/audio_coding/codecs/g722/g722_enc_dec.h" #include "typedefs.h" // NOLINT(build/include) #if !defined(FALSE) diff --git a/modules/audio_coding/codecs/g722/g722_interface.c b/modules/audio_coding/codecs/g722/g722_interface.c index b6dccb454f..fb250492a1 100644 --- a/modules/audio_coding/codecs/g722/g722_interface.c +++ b/modules/audio_coding/codecs/g722/g722_interface.c @@ -8,12 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ - - #include #include -#include "g722_enc_dec.h" -#include "g722_interface.h" + +#include "modules/audio_coding/codecs/g722/g722_enc_dec.h" +#include "modules/audio_coding/codecs/g722/g722_interface.h" #include "typedefs.h" // NOLINT(build/include) int16_t WebRtcG722_CreateEncoder(G722EncInst **G722enc_inst) @@ -104,4 +103,3 @@ int16_t WebRtcG722_Version(char *versionStr, short len) return -1; } } -