diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-11-04 15:21:41 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-11-04 15:21:41 +0000 |
| commit | 6651f18386d5bd9870d621ace2a11dec1cb68c80 (patch) | |
| tree | 940b095a69f4c43993cdf329d0aa6a8702b9ab3d /common_audio/common_audio.gyp | |
| parent | 2dc72e3be449734e64ff706df1765ac1bfe64b23 (diff) | |
| parent | a1fd19c12e4efdf4b8a5f92323070443d50dc34e (diff) | |
| download | webrtc-6651f18386d5bd9870d621ace2a11dec1cb68c80.tar.gz | |
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at a1fd19c12e4efdf4b8a5f92323070443d50dc34e
This commit was generated by merge_from_chromium.py.
Change-Id: Ibd48eca2d93e6324a2e886e451f27307aab45e9b
Diffstat (limited to 'common_audio/common_audio.gyp')
| -rw-r--r-- | common_audio/common_audio.gyp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/common_audio/common_audio.gyp b/common_audio/common_audio.gyp index 6c1b7960..8f96674f 100644 --- a/common_audio/common_audio.gyp +++ b/common_audio/common_audio.gyp @@ -85,7 +85,9 @@ 'signal_processing/splitting_filter.c', 'signal_processing/sqrt_of_one_minus_x_squared.c', 'signal_processing/vector_scaling_operations.c', + 'vad/include/vad.h', 'vad/include/webrtc_vad.h', + 'vad/vad.cc', 'vad/webrtc_vad.c', 'vad/vad_core.c', 'vad/vad_core.h', @@ -97,8 +99,8 @@ 'vad/vad_sp.h', 'wav_header.cc', 'wav_header.h', - 'wav_writer.cc', - 'wav_writer.h', + 'wav_file.cc', + 'wav_file.h', 'window_generator.cc', 'window_generator.h', ], @@ -138,7 +140,7 @@ }], ], # conditions }], - ['target_arch=="mipsel"', { + ['target_arch=="mipsel" and mips_arch_variant!="r6"', { 'sources': [ 'signal_processing/include/spl_inl_mips.h', 'signal_processing/complex_bit_reverse_mips.c', @@ -243,7 +245,7 @@ 'vad/vad_unittest.cc', 'vad/vad_unittest.h', 'wav_header_unittest.cc', - 'wav_writer_unittest.cc', + 'wav_file_unittest.cc', 'window_generator_unittest.cc', ], 'conditions': [ @@ -283,7 +285,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'common_audio_unittests.isolate', ], 'sources': [ 'common_audio_unittests.isolate', |