modules/audio_coding: Remove some codec include dirs

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("//build/config/arm.gni")
 import("../../build/webrtc.gni")
@@ skipping 148 matching lines @@
 config("cng_config") {
   include_dirs = [
     "../../..",
     "codecs/cng/include",
   ]
 }
 
 source_set("cng") {
   sources = [
     "codecs/cng/audio_encoder_cng.cc",
+    "codecs/cng/audio_encoder_cng.h",
     "codecs/cng/cng_helpfuns.c",
     "codecs/cng/cng_helpfuns.h",
-    "codecs/cng/include/audio_encoder_cng.h",
-    "codecs/cng/include/webrtc_cng.h",
     "codecs/cng/webrtc_cng.c",
+    "codecs/cng/webrtc_cng.h",
   ]
 
   configs += [ "../..:common_config" ]
 
   public_configs = [
     "../..:common_inherited_config",
     ":cng_config",
   ]
 
   deps = [
@@ skipping 28 matching lines @@
 config("g711_config") {
   include_dirs = [
     "../../..",
     "codecs/g711/include",
   ]
 }
 
 source_set("g711") {
   sources = [
     "codecs/g711/audio_decoder_pcm.cc",
+    "codecs/g711/audio_decoder_pcm.h",
     "codecs/g711/audio_encoder_pcm.cc",
+    "codecs/g711/audio_encoder_pcm.h",
     "codecs/g711/g711.c",
     "codecs/g711/g711.h",
     "codecs/g711/g711_interface.c",
-    "codecs/g711/include/audio_decoder_pcm.h",
-    "codecs/g711/include/audio_encoder_pcm.h",
-    "codecs/g711/include/g711_interface.h",
+    "codecs/g711/g711_interface.h",
   ]
 
   configs += [ "../..:common_config" ]
 
   public_configs = [
     "../..:common_inherited_config",
     ":g711_config",
   ]
 
   deps = [
     ":audio_encoder_interface",
   ]
 }
 
 config("g722_config") {
   include_dirs = [
     "../../..",
     "codecs/g722/include",
   ]
 }
 
 source_set("g722") {
   sources = [
     "codecs/g722/audio_decoder_g722.cc",
+    "codecs/g722/audio_decoder_g722.h",
     "codecs/g722/audio_encoder_g722.cc",
+    "codecs/g722/audio_encoder_g722.h",
     "codecs/g722/g722_decode.c",
     "codecs/g722/g722_enc_dec.h",
     "codecs/g722/g722_encode.c",
     "codecs/g722/g722_interface.c",
-    "codecs/g722/include/audio_decoder_g722.h",
-    "codecs/g722/include/audio_encoder_g722.h",
-    "codecs/g722/include/g722_interface.h",
+    "codecs/g722/g722_interface.h",
   ]
 
   configs += [ "../..:common_config" ]
 
   public_configs = [
     "../..:common_inherited_config",
     ":g722_config",
   ]
 
   deps = [
     ":audio_encoder_interface",
   ]
 }
 
 config("ilbc_config") {
   include_dirs = [
     "../../..",
     "codecs/ilbc/include",
   ]
 }
 
 source_set("ilbc") {
   sources = [
     "codecs/ilbc/abs_quant.c",
     "codecs/ilbc/abs_quant.h",
     "codecs/ilbc/abs_quant_loop.c",
     "codecs/ilbc/abs_quant_loop.h",
     "codecs/ilbc/audio_decoder_ilbc.cc",
+    "codecs/ilbc/audio_decoder_ilbc.h",
     "codecs/ilbc/audio_encoder_ilbc.cc",
+    "codecs/ilbc/audio_encoder_ilbc.h",
     "codecs/ilbc/augmented_cb_corr.c",
     "codecs/ilbc/augmented_cb_corr.h",
     "codecs/ilbc/bw_expand.c",
     "codecs/ilbc/bw_expand.h",
     "codecs/ilbc/cb_construct.c",
     "codecs/ilbc/cb_construct.h",
     "codecs/ilbc/cb_mem_energy.c",
     "codecs/ilbc/cb_mem_energy.h",
     "codecs/ilbc/cb_mem_energy_augmentation.c",
     "codecs/ilbc/cb_mem_energy_augmentation.h",
@@ skipping 44 matching lines @@
     "codecs/ilbc/get_cd_vec.h",
     "codecs/ilbc/get_lsp_poly.c",
     "codecs/ilbc/get_lsp_poly.h",
     "codecs/ilbc/get_sync_seq.c",
     "codecs/ilbc/get_sync_seq.h",
     "codecs/ilbc/hp_input.c",
     "codecs/ilbc/hp_input.h",
     "codecs/ilbc/hp_output.c",
     "codecs/ilbc/hp_output.h",
     "codecs/ilbc/ilbc.c",
-    "codecs/ilbc/include/audio_decoder_ilbc.h",
-    "codecs/ilbc/include/audio_encoder_ilbc.h",
-    "codecs/ilbc/include/ilbc.h",
+    "codecs/ilbc/ilbc.h",
     "codecs/ilbc/index_conv_dec.c",
     "codecs/ilbc/index_conv_dec.h",
     "codecs/ilbc/index_conv_enc.c",
     "codecs/ilbc/index_conv_enc.h",
     "codecs/ilbc/init_decode.c",
     "codecs/ilbc/init_decode.h",
     "codecs/ilbc/init_encode.c",
     "codecs/ilbc/init_encode.h",
     "codecs/ilbc/interpolate.c",
     "codecs/ilbc/interpolate.h",
@@ skipping 322 matching lines @@
 config("pcm16b_config") {
   include_dirs = [
     "../../..",
     "codecs/pcm16b/include",
   ]
 }
 
 source_set("pcm16b") {
   sources = [
     "codecs/pcm16b/audio_decoder_pcm16b.cc",
+    "codecs/pcm16b/audio_decoder_pcm16b.h",
     "codecs/pcm16b/audio_encoder_pcm16b.cc",
-    "codecs/pcm16b/include/audio_decoder_pcm16b.h",
-    "codecs/pcm16b/include/audio_encoder_pcm16b.h",
-    "codecs/pcm16b/include/pcm16b.h",
+    "codecs/pcm16b/audio_encoder_pcm16b.h",
     "codecs/pcm16b/pcm16b.c",
+    "codecs/pcm16b/pcm16b.h",
   ]
 
   deps = [
     ":audio_encoder_interface",
     ":g711",
   ]
 
   configs += [ "../..:common_config" ]
 
   public_configs = [
     "../..:common_inherited_config",
     ":pcm16b_config",
   ]
 }
 
 config("opus_config") {
   include_dirs = [ "../../.." ]
 }
 
 source_set("webrtc_opus") {
   sources = [
     "codecs/opus/audio_decoder_opus.cc",
+    "codecs/opus/audio_decoder_opus.h",
     "codecs/opus/audio_encoder_opus.cc",
-    "codecs/opus/include/audio_decoder_opus.h",
-    "codecs/opus/include/audio_encoder_opus.h",
-    "codecs/opus/include/opus_interface.h",
+    "codecs/opus/audio_encoder_opus.h",
     "codecs/opus/opus_inst.h",
     "codecs/opus/opus_interface.c",
+    "codecs/opus/opus_interface.h",
   ]
 
   deps = [
     ":audio_encoder_interface",
   ]
 
   if (rtc_build_opus) {
     configs += [ "../..:common_config" ]
     public_configs = [ "../..:common_inherited_config" ]
 
@@ skipping 116 matching lines @@
       deps += [ ":isac" ]
     }
     defines += [ "WEBRTC_CODEC_G722" ]
     deps += [ ":g722" ]
   }
   if (!build_with_mozilla && !build_with_chromium) {
     defines += [ "WEBRTC_CODEC_ILBC" ]
     deps += [ ":ilbc" ]
   }
 }