Merge beamformer

R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/34529004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7958 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_processing/audio_processing_tests.gypi b/webrtc/modules/audio_processing/audio_processing_tests.gypi
index 7c36be7..0a3393b 100644
--- a/webrtc/modules/audio_processing/audio_processing_tests.gypi
+++ b/webrtc/modules/audio_processing/audio_processing_tests.gypi
@@ -85,5 +85,22 @@
         },  # click_annotate
       ],
     }],
+    ['rtc_use_openmax_dl==1', {
+      'targets': [
+        {
+          'target_name': 'beamformer_test',
+          'type': 'executable',
+          'dependencies': [
+            '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
+            '<(webrtc_root)/modules/modules.gyp:audio_processing',
+          ],
+          'sources': [
+            'beamformer/beamformer_test.cc',
+            'beamformer/pcm_utils.cc',
+            'beamformer/pcm_utils.h',
+          ],
+        }, # beamformer_test
+      ],
+    }],
   ],
 }