Remove build-time beamformer flags.
RealFourier is now unconditionally enabled since we can fall back to the
Ooura FFT. We no longer need to condition users on rtc_use_openmax_dl.
R=aluebs@webrtc.org, mgraczyk@google.com
Review URL: https://webrtc-codereview.appspot.com/50439004
Cr-Commit-Position: refs/heads/master@{#8799}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8799 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_processing/audio_processing.gypi b/webrtc/modules/audio_processing/audio_processing.gypi
index 9d1ac8c..0b19fd9 100644
--- a/webrtc/modules/audio_processing/audio_processing.gypi
+++ b/webrtc/modules/audio_processing/audio_processing.gypi
@@ -86,6 +86,8 @@
'beamformer/covariance_matrix_generator.cc',
'beamformer/covariance_matrix_generator.h',
'beamformer/matrix.h',
+ 'beamformer/nonlinear_beamformer.cc',
+ 'beamformer/nonlinear_beamformer.h',
'common.h',
'echo_cancellation_impl.cc',
'echo_cancellation_impl.h',
@@ -174,13 +176,6 @@
'ns/windows_private.h',
],
}],
- ['rtc_use_openmax_dl==1', {
- 'defines': ['WEBRTC_BEAMFORMER'],
- 'sources': [
- 'beamformer/nonlinear_beamformer.cc',
- 'beamformer/nonlinear_beamformer.h',
- ],
- }],
['target_arch=="ia32" or target_arch=="x64"', {
'dependencies': ['audio_processing_sse2',],
}],