diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-08-21 15:57:57 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-08-21 15:57:57 +0000 |
| commit | 430518e6143a3019568ded58407cb72f805f532c (patch) | |
| tree | 1197ba0dedd9581a1d20706df45ed7e684872303 /common_audio | |
| parent | e0ff458bb4794d90c8fa9dd338d7e9517e139f77 (diff) | |
| download | webrtc-430518e6143a3019568ded58407cb72f805f532c.tar.gz | |
Update makefiles after merge of Chromium at 291084
This commit was generated by merge_from_chromium.py.
Change-Id: I76d1c82b1481ca20fc3520fb631c5cba99805342
Diffstat (limited to 'common_audio')
| -rw-r--r-- | common_audio/common_audio.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | common_audio/common_audio.target.darwin-arm64.mk | 4 | ||||
| -rw-r--r-- | common_audio/common_audio.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | common_audio/common_audio.target.darwin-x86.mk | 4 | ||||
| -rw-r--r-- | common_audio/common_audio.target.darwin-x86_64.mk | 4 | ||||
| -rw-r--r-- | common_audio/common_audio.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | common_audio/common_audio.target.linux-arm64.mk | 4 | ||||
| -rw-r--r-- | common_audio/common_audio.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | common_audio/common_audio.target.linux-x86.mk | 4 | ||||
| -rw-r--r-- | common_audio/common_audio.target.linux-x86_64.mk | 4 |
10 files changed, 26 insertions, 6 deletions
diff --git a/common_audio/common_audio.target.darwin-arm.mk b/common_audio/common_audio.target.darwin-arm.mk index 1e1c6de7..4c5676b8 100644 --- a/common_audio/common_audio.target.darwin-arm.mk +++ b/common_audio/common_audio.target.darwin-arm.mk @@ -66,6 +66,8 @@ LOCAL_SRC_FILES := \ third_party/webrtc/common_audio/vad/vad_filterbank.c \ third_party/webrtc/common_audio/vad/vad_gmm.c \ third_party/webrtc/common_audio/vad/vad_sp.c \ + third_party/webrtc/common_audio/wav_header.cc \ + third_party/webrtc/common_audio/wav_writer.cc \ third_party/webrtc/common_audio/signal_processing/complex_bit_reverse_arm.S \ third_party/webrtc/common_audio/signal_processing/spl_sqrt_floor_arm.S \ third_party/webrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S diff --git a/common_audio/common_audio.target.darwin-arm64.mk b/common_audio/common_audio.target.darwin-arm64.mk index 34d20944..b6e77bb5 100644 --- a/common_audio/common_audio.target.darwin-arm64.mk +++ b/common_audio/common_audio.target.darwin-arm64.mk @@ -68,7 +68,9 @@ LOCAL_SRC_FILES := \ third_party/webrtc/common_audio/vad/vad_core.c \ third_party/webrtc/common_audio/vad/vad_filterbank.c \ third_party/webrtc/common_audio/vad/vad_gmm.c \ - third_party/webrtc/common_audio/vad/vad_sp.c + third_party/webrtc/common_audio/vad/vad_sp.c \ + third_party/webrtc/common_audio/wav_header.cc \ + third_party/webrtc/common_audio/wav_writer.cc # Flags passed to both C and C++ files. diff --git a/common_audio/common_audio.target.darwin-mips.mk b/common_audio/common_audio.target.darwin-mips.mk index 69918f57..1dc88cd3 100644 --- a/common_audio/common_audio.target.darwin-mips.mk +++ b/common_audio/common_audio.target.darwin-mips.mk @@ -65,6 +65,8 @@ LOCAL_SRC_FILES := \ third_party/webrtc/common_audio/vad/vad_filterbank.c \ third_party/webrtc/common_audio/vad/vad_gmm.c \ third_party/webrtc/common_audio/vad/vad_sp.c \ + third_party/webrtc/common_audio/wav_header.cc \ + third_party/webrtc/common_audio/wav_writer.cc \ third_party/webrtc/common_audio/signal_processing/complex_bit_reverse_mips.c \ third_party/webrtc/common_audio/signal_processing/complex_fft_mips.c \ third_party/webrtc/common_audio/signal_processing/cross_correlation_mips.c \ diff --git a/common_audio/common_audio.target.darwin-x86.mk b/common_audio/common_audio.target.darwin-x86.mk index 0c266a64..1cbe0793 100644 --- a/common_audio/common_audio.target.darwin-x86.mk +++ b/common_audio/common_audio.target.darwin-x86.mk @@ -68,7 +68,9 @@ LOCAL_SRC_FILES := \ third_party/webrtc/common_audio/vad/vad_core.c \ third_party/webrtc/common_audio/vad/vad_filterbank.c \ third_party/webrtc/common_audio/vad/vad_gmm.c \ - third_party/webrtc/common_audio/vad/vad_sp.c + third_party/webrtc/common_audio/vad/vad_sp.c \ + third_party/webrtc/common_audio/wav_header.cc \ + third_party/webrtc/common_audio/wav_writer.cc # Flags passed to both C and C++ files. diff --git a/common_audio/common_audio.target.darwin-x86_64.mk b/common_audio/common_audio.target.darwin-x86_64.mk index 39ef4a09..878774e6 100644 --- a/common_audio/common_audio.target.darwin-x86_64.mk +++ b/common_audio/common_audio.target.darwin-x86_64.mk @@ -68,7 +68,9 @@ LOCAL_SRC_FILES := \ third_party/webrtc/common_audio/vad/vad_core.c \ third_party/webrtc/common_audio/vad/vad_filterbank.c \ third_party/webrtc/common_audio/vad/vad_gmm.c \ - third_party/webrtc/common_audio/vad/vad_sp.c + third_party/webrtc/common_audio/vad/vad_sp.c \ + third_party/webrtc/common_audio/wav_header.cc \ + third_party/webrtc/common_audio/wav_writer.cc # Flags passed to both C and C++ files. diff --git a/common_audio/common_audio.target.linux-arm.mk b/common_audio/common_audio.target.linux-arm.mk index 1e1c6de7..4c5676b8 100644 --- a/common_audio/common_audio.target.linux-arm.mk +++ b/common_audio/common_audio.target.linux-arm.mk @@ -66,6 +66,8 @@ LOCAL_SRC_FILES := \ third_party/webrtc/common_audio/vad/vad_filterbank.c \ third_party/webrtc/common_audio/vad/vad_gmm.c \ third_party/webrtc/common_audio/vad/vad_sp.c \ + third_party/webrtc/common_audio/wav_header.cc \ + third_party/webrtc/common_audio/wav_writer.cc \ third_party/webrtc/common_audio/signal_processing/complex_bit_reverse_arm.S \ third_party/webrtc/common_audio/signal_processing/spl_sqrt_floor_arm.S \ third_party/webrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S diff --git a/common_audio/common_audio.target.linux-arm64.mk b/common_audio/common_audio.target.linux-arm64.mk index 34d20944..b6e77bb5 100644 --- a/common_audio/common_audio.target.linux-arm64.mk +++ b/common_audio/common_audio.target.linux-arm64.mk @@ -68,7 +68,9 @@ LOCAL_SRC_FILES := \ third_party/webrtc/common_audio/vad/vad_core.c \ third_party/webrtc/common_audio/vad/vad_filterbank.c \ third_party/webrtc/common_audio/vad/vad_gmm.c \ - third_party/webrtc/common_audio/vad/vad_sp.c + third_party/webrtc/common_audio/vad/vad_sp.c \ + third_party/webrtc/common_audio/wav_header.cc \ + third_party/webrtc/common_audio/wav_writer.cc # Flags passed to both C and C++ files. diff --git a/common_audio/common_audio.target.linux-mips.mk b/common_audio/common_audio.target.linux-mips.mk index 69918f57..1dc88cd3 100644 --- a/common_audio/common_audio.target.linux-mips.mk +++ b/common_audio/common_audio.target.linux-mips.mk @@ -65,6 +65,8 @@ LOCAL_SRC_FILES := \ third_party/webrtc/common_audio/vad/vad_filterbank.c \ third_party/webrtc/common_audio/vad/vad_gmm.c \ third_party/webrtc/common_audio/vad/vad_sp.c \ + third_party/webrtc/common_audio/wav_header.cc \ + third_party/webrtc/common_audio/wav_writer.cc \ third_party/webrtc/common_audio/signal_processing/complex_bit_reverse_mips.c \ third_party/webrtc/common_audio/signal_processing/complex_fft_mips.c \ third_party/webrtc/common_audio/signal_processing/cross_correlation_mips.c \ diff --git a/common_audio/common_audio.target.linux-x86.mk b/common_audio/common_audio.target.linux-x86.mk index 0c266a64..1cbe0793 100644 --- a/common_audio/common_audio.target.linux-x86.mk +++ b/common_audio/common_audio.target.linux-x86.mk @@ -68,7 +68,9 @@ LOCAL_SRC_FILES := \ third_party/webrtc/common_audio/vad/vad_core.c \ third_party/webrtc/common_audio/vad/vad_filterbank.c \ third_party/webrtc/common_audio/vad/vad_gmm.c \ - third_party/webrtc/common_audio/vad/vad_sp.c + third_party/webrtc/common_audio/vad/vad_sp.c \ + third_party/webrtc/common_audio/wav_header.cc \ + third_party/webrtc/common_audio/wav_writer.cc # Flags passed to both C and C++ files. diff --git a/common_audio/common_audio.target.linux-x86_64.mk b/common_audio/common_audio.target.linux-x86_64.mk index 39ef4a09..878774e6 100644 --- a/common_audio/common_audio.target.linux-x86_64.mk +++ b/common_audio/common_audio.target.linux-x86_64.mk @@ -68,7 +68,9 @@ LOCAL_SRC_FILES := \ third_party/webrtc/common_audio/vad/vad_core.c \ third_party/webrtc/common_audio/vad/vad_filterbank.c \ third_party/webrtc/common_audio/vad/vad_gmm.c \ - third_party/webrtc/common_audio/vad/vad_sp.c + third_party/webrtc/common_audio/vad/vad_sp.c \ + third_party/webrtc/common_audio/wav_header.cc \ + third_party/webrtc/common_audio/wav_writer.cc # Flags passed to both C and C++ files. |