Revert "Pull the Voice Activity Detector out from the AGC"

webrtc/modules/audio_processing/audio_processing.gypi

 # Copyright (c) 2012 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.
 
 {
   'variables': {
@@ skipping 30 matching lines @@
         'aec/aec_resampler.h',
         'aec/echo_cancellation.c',
         'aec/echo_cancellation_internal.h',
         'aec/include/echo_cancellation.h',
         'aecm/aecm_core.c',
         'aecm/aecm_core.h',
         'aecm/echo_control_mobile.c',
         'aecm/include/echo_control_mobile.h',
         'agc/agc.cc',
         'agc/agc.h',
+        'agc/agc_audio_proc.cc',
+        'agc/agc_audio_proc.h',
+        'agc/agc_audio_proc_internal.h',
         'agc/agc_manager_direct.cc',
         'agc/agc_manager_direct.h',
+        'agc/circular_buffer.cc',
+        'agc/circular_buffer.h',
+        'agc/common.h',
         'agc/gain_map_internal.h',
+        'agc/gmm.cc',
+        'agc/gmm.h',
         'agc/histogram.cc',
         'agc/histogram.h',
         'agc/legacy/analog_agc.c',
         'agc/legacy/analog_agc.h',
         'agc/legacy/digital_agc.c',
         'agc/legacy/digital_agc.h',
         'agc/legacy/gain_control.h',
+        'agc/noise_gmm_tables.h',
+        'agc/pitch_based_vad.cc',
+        'agc/pitch_based_vad.h',
+        'agc/pitch_internal.cc',
+        'agc/pitch_internal.h',
+        'agc/pole_zero_filter.cc',
+        'agc/pole_zero_filter.h',
+        'agc/standalone_vad.cc',
+        'agc/standalone_vad.h',
         'agc/utility.cc',
         'agc/utility.h',
+        'agc/voice_gmm_tables.h',
         'audio_buffer.cc',
         'audio_buffer.h',
         'audio_processing_impl.cc',
         'audio_processing_impl.h',
         'beamformer/beamformer.h',
         'beamformer/complex_matrix.h',
         'beamformer/covariance_matrix_generator.cc',
         'beamformer/covariance_matrix_generator.h',
         'beamformer/matrix.h',
         'beamformer/nonlinear_beamformer.cc',
@@ skipping 37 matching lines @@
         'transient/wpd_node.h',
         'transient/wpd_tree.cc',
         'transient/wpd_tree.h',
         'typing_detection.cc',
         'typing_detection.h',
         'utility/delay_estimator.c',
         'utility/delay_estimator.h',
         'utility/delay_estimator_internal.h',
         'utility/delay_estimator_wrapper.c',
         'utility/delay_estimator_wrapper.h',
-        'vad/common.h',
-        'vad/gmm.cc',
-        'vad/gmm.h',
-        'vad/noise_gmm_tables.h',
-        'vad/pitch_based_vad.cc',
-        'vad/pitch_based_vad.h',
-        'vad/pitch_internal.cc',
-        'vad/pitch_internal.h',
-        'vad/pole_zero_filter.cc',
-        'vad/pole_zero_filter.h',
-        'vad/standalone_vad.cc',
-        'vad/standalone_vad.h',
-        'vad/vad_audio_proc.cc',
-        'vad/vad_audio_proc.h',
-        'vad/vad_audio_proc_internal.h',
-        'vad/vad_circular_buffer.cc',
-        'vad/vad_circular_buffer.h',
-        'vad/voice_activity_detector.cc',
-        'vad/voice_activity_detector.h',
-        'vad/voice_gmm_tables.h',
         'voice_detection_impl.cc',
         'voice_detection_impl.h',
       ],
       'conditions': [
         ['aec_debug_dump==1', {
           'defines': ['WEBRTC_AEC_DEBUG_DUMP',],
         }],
         ['aec_untrusted_delay_for_testing==1', {
           'defines': ['WEBRTC_UNTRUSTED_DELAY',],
         }],
@@ skipping 112 matching lines @@
         'sources': [
           'aec/aec_core_neon.c',
           'aec/aec_rdft_neon.c',
           'aecm/aecm_core_neon.c',
           'ns/nsx_core_neon.c',
         ],
       }],
     }],
   ],
 }