Update makefiles after merge of Chromium at b415a9063014

This commit was generated by merge_from_chromium.py.

Change-Id: I7f50ecd9ae7e0eddc2c072b6eac49c0720d1002d

10 files changed, 74 insertions, 6 deletions

diff --git a/common_audio/common_audio.target.darwin-arm.mk b/common_audio/common_audio.target.darwin-arm.mk
index 4fe74228..bca3ee30 100644
--- a/common_audio/common_audio.target.darwin-arm.mk
+++ b/common_audio/common_audio.target.darwin-arm.mk
@@ -24,6 +24,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS :=
 
 LOCAL_SRC_FILES := \
 	third_party/webrtc/common_audio/audio_util.cc \
+	third_party/webrtc/common_audio/blocker.cc \
 	third_party/webrtc/common_audio/fir_filter.cc \
 	third_party/webrtc/common_audio/resampler/push_resampler.cc \
 	third_party/webrtc/common_audio/resampler/push_sinc_resampler.cc \
@@ -67,6 +68,9 @@ LOCAL_SRC_FILES := \
 	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/window_generator.cc \
+	third_party/webrtc/common_audio/lapped_transform.cc \
+	third_party/webrtc/common_audio/real_fourier.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
@@ -148,6 +152,7 @@ MY_DEFS_Debug := \
 	'-DWEBRTC_LINUX' \
 	'-DWEBRTC_ANDROID' \
 	'-DWEBRTC_ANDROID_OPENSLES' \
+	'-DDL_ARM_NEON_OPTIONAL' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-D__STDC_CONSTANT_MACROS' \
@@ -171,6 +176,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -266,6 +272,7 @@ MY_DEFS_Release := \
 	'-DWEBRTC_LINUX' \
 	'-DWEBRTC_ANDROID' \
 	'-DWEBRTC_ANDROID_OPENSLES' \
+	'-DDL_ARM_NEON_OPTIONAL' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-D__STDC_CONSTANT_MACROS' \
@@ -290,6 +297,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/common_audio/common_audio.target.darwin-arm64.mk b/common_audio/common_audio.target.darwin-arm64.mk
index 746a6448..139e9e88 100644
--- a/common_audio/common_audio.target.darwin-arm64.mk
+++ b/common_audio/common_audio.target.darwin-arm64.mk
@@ -24,6 +24,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS :=
 
 LOCAL_SRC_FILES := \
 	third_party/webrtc/common_audio/audio_util.cc \
+	third_party/webrtc/common_audio/blocker.cc \
 	third_party/webrtc/common_audio/fir_filter.cc \
 	third_party/webrtc/common_audio/resampler/push_resampler.cc \
 	third_party/webrtc/common_audio/resampler/push_sinc_resampler.cc \
@@ -69,7 +70,10 @@ LOCAL_SRC_FILES := \
 	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/wav_writer.cc \
+	third_party/webrtc/common_audio/window_generator.cc \
+	third_party/webrtc/common_audio/lapped_transform.cc \
+	third_party/webrtc/common_audio/real_fourier.cc
 
 
 # Flags passed to both C and C++ files.
@@ -134,6 +138,7 @@ MY_DEFS_Debug := \
 	'-DWEBRTC_LINUX' \
 	'-DWEBRTC_ANDROID' \
 	'-DWEBRTC_ANDROID_OPENSLES' \
+	'-DDL_ARM_NEON' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-D__STDC_CONSTANT_MACROS' \
@@ -157,6 +162,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -237,6 +243,7 @@ MY_DEFS_Release := \
 	'-DWEBRTC_LINUX' \
 	'-DWEBRTC_ANDROID' \
 	'-DWEBRTC_ANDROID_OPENSLES' \
+	'-DDL_ARM_NEON' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-D__STDC_CONSTANT_MACROS' \
@@ -261,6 +268,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/common_audio/common_audio.target.darwin-mips.mk b/common_audio/common_audio.target.darwin-mips.mk
index ea5ceeea..7820ddfe 100644
--- a/common_audio/common_audio.target.darwin-mips.mk
+++ b/common_audio/common_audio.target.darwin-mips.mk
@@ -24,6 +24,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS :=
 
 LOCAL_SRC_FILES := \
 	third_party/webrtc/common_audio/audio_util.cc \
+	third_party/webrtc/common_audio/blocker.cc \
 	third_party/webrtc/common_audio/fir_filter.cc \
 	third_party/webrtc/common_audio/resampler/push_resampler.cc \
 	third_party/webrtc/common_audio/resampler/push_sinc_resampler.cc \
@@ -66,6 +67,9 @@ LOCAL_SRC_FILES := \
 	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/window_generator.cc \
+	third_party/webrtc/common_audio/lapped_transform.cc \
+	third_party/webrtc/common_audio/real_fourier.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 \
@@ -167,6 +171,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -278,6 +283,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/common_audio/common_audio.target.darwin-x86.mk b/common_audio/common_audio.target.darwin-x86.mk
index a1321d28..a8affdc0 100644
--- a/common_audio/common_audio.target.darwin-x86.mk
+++ b/common_audio/common_audio.target.darwin-x86.mk
@@ -24,6 +24,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS :=
 
 LOCAL_SRC_FILES := \
 	third_party/webrtc/common_audio/audio_util.cc \
+	third_party/webrtc/common_audio/blocker.cc \
 	third_party/webrtc/common_audio/fir_filter.cc \
 	third_party/webrtc/common_audio/resampler/push_resampler.cc \
 	third_party/webrtc/common_audio/resampler/push_sinc_resampler.cc \
@@ -69,7 +70,10 @@ LOCAL_SRC_FILES := \
 	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/wav_writer.cc \
+	third_party/webrtc/common_audio/window_generator.cc \
+	third_party/webrtc/common_audio/lapped_transform.cc \
+	third_party/webrtc/common_audio/real_fourier.cc
 
 
 # Flags passed to both C and C++ files.
@@ -163,6 +167,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -273,6 +278,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/common_audio/common_audio.target.darwin-x86_64.mk b/common_audio/common_audio.target.darwin-x86_64.mk
index 5f9426e1..ff83cb94 100644
--- a/common_audio/common_audio.target.darwin-x86_64.mk
+++ b/common_audio/common_audio.target.darwin-x86_64.mk
@@ -24,6 +24,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS :=
 
 LOCAL_SRC_FILES := \
 	third_party/webrtc/common_audio/audio_util.cc \
+	third_party/webrtc/common_audio/blocker.cc \
 	third_party/webrtc/common_audio/fir_filter.cc \
 	third_party/webrtc/common_audio/resampler/push_resampler.cc \
 	third_party/webrtc/common_audio/resampler/push_sinc_resampler.cc \
@@ -69,7 +70,10 @@ LOCAL_SRC_FILES := \
 	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/wav_writer.cc \
+	third_party/webrtc/common_audio/window_generator.cc \
+	third_party/webrtc/common_audio/lapped_transform.cc \
+	third_party/webrtc/common_audio/real_fourier.cc
 
 
 # Flags passed to both C and C++ files.
@@ -162,6 +166,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -271,6 +276,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/common_audio/common_audio.target.linux-arm.mk b/common_audio/common_audio.target.linux-arm.mk
index 4fe74228..bca3ee30 100644
--- a/common_audio/common_audio.target.linux-arm.mk
+++ b/common_audio/common_audio.target.linux-arm.mk
@@ -24,6 +24,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS :=
 
 LOCAL_SRC_FILES := \
 	third_party/webrtc/common_audio/audio_util.cc \
+	third_party/webrtc/common_audio/blocker.cc \
 	third_party/webrtc/common_audio/fir_filter.cc \
 	third_party/webrtc/common_audio/resampler/push_resampler.cc \
 	third_party/webrtc/common_audio/resampler/push_sinc_resampler.cc \
@@ -67,6 +68,9 @@ LOCAL_SRC_FILES := \
 	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/window_generator.cc \
+	third_party/webrtc/common_audio/lapped_transform.cc \
+	third_party/webrtc/common_audio/real_fourier.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
@@ -148,6 +152,7 @@ MY_DEFS_Debug := \
 	'-DWEBRTC_LINUX' \
 	'-DWEBRTC_ANDROID' \
 	'-DWEBRTC_ANDROID_OPENSLES' \
+	'-DDL_ARM_NEON_OPTIONAL' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-D__STDC_CONSTANT_MACROS' \
@@ -171,6 +176,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -266,6 +272,7 @@ MY_DEFS_Release := \
 	'-DWEBRTC_LINUX' \
 	'-DWEBRTC_ANDROID' \
 	'-DWEBRTC_ANDROID_OPENSLES' \
+	'-DDL_ARM_NEON_OPTIONAL' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-D__STDC_CONSTANT_MACROS' \
@@ -290,6 +297,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/common_audio/common_audio.target.linux-arm64.mk b/common_audio/common_audio.target.linux-arm64.mk
index 746a6448..139e9e88 100644
--- a/common_audio/common_audio.target.linux-arm64.mk
+++ b/common_audio/common_audio.target.linux-arm64.mk
@@ -24,6 +24,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS :=
 
 LOCAL_SRC_FILES := \
 	third_party/webrtc/common_audio/audio_util.cc \
+	third_party/webrtc/common_audio/blocker.cc \
 	third_party/webrtc/common_audio/fir_filter.cc \
 	third_party/webrtc/common_audio/resampler/push_resampler.cc \
 	third_party/webrtc/common_audio/resampler/push_sinc_resampler.cc \
@@ -69,7 +70,10 @@ LOCAL_SRC_FILES := \
 	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/wav_writer.cc \
+	third_party/webrtc/common_audio/window_generator.cc \
+	third_party/webrtc/common_audio/lapped_transform.cc \
+	third_party/webrtc/common_audio/real_fourier.cc
 
 
 # Flags passed to both C and C++ files.
@@ -134,6 +138,7 @@ MY_DEFS_Debug := \
 	'-DWEBRTC_LINUX' \
 	'-DWEBRTC_ANDROID' \
 	'-DWEBRTC_ANDROID_OPENSLES' \
+	'-DDL_ARM_NEON' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-D__STDC_CONSTANT_MACROS' \
@@ -157,6 +162,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -237,6 +243,7 @@ MY_DEFS_Release := \
 	'-DWEBRTC_LINUX' \
 	'-DWEBRTC_ANDROID' \
 	'-DWEBRTC_ANDROID_OPENSLES' \
+	'-DDL_ARM_NEON' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-D__STDC_CONSTANT_MACROS' \
@@ -261,6 +268,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/common_audio/common_audio.target.linux-mips.mk b/common_audio/common_audio.target.linux-mips.mk
index ea5ceeea..7820ddfe 100644
--- a/common_audio/common_audio.target.linux-mips.mk
+++ b/common_audio/common_audio.target.linux-mips.mk
@@ -24,6 +24,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS :=
 
 LOCAL_SRC_FILES := \
 	third_party/webrtc/common_audio/audio_util.cc \
+	third_party/webrtc/common_audio/blocker.cc \
 	third_party/webrtc/common_audio/fir_filter.cc \
 	third_party/webrtc/common_audio/resampler/push_resampler.cc \
 	third_party/webrtc/common_audio/resampler/push_sinc_resampler.cc \
@@ -66,6 +67,9 @@ LOCAL_SRC_FILES := \
 	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/window_generator.cc \
+	third_party/webrtc/common_audio/lapped_transform.cc \
+	third_party/webrtc/common_audio/real_fourier.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 \
@@ -167,6 +171,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -278,6 +283,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/common_audio/common_audio.target.linux-x86.mk b/common_audio/common_audio.target.linux-x86.mk
index a1321d28..a8affdc0 100644
--- a/common_audio/common_audio.target.linux-x86.mk
+++ b/common_audio/common_audio.target.linux-x86.mk
@@ -24,6 +24,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS :=
 
 LOCAL_SRC_FILES := \
 	third_party/webrtc/common_audio/audio_util.cc \
+	third_party/webrtc/common_audio/blocker.cc \
 	third_party/webrtc/common_audio/fir_filter.cc \
 	third_party/webrtc/common_audio/resampler/push_resampler.cc \
 	third_party/webrtc/common_audio/resampler/push_sinc_resampler.cc \
@@ -69,7 +70,10 @@ LOCAL_SRC_FILES := \
 	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/wav_writer.cc \
+	third_party/webrtc/common_audio/window_generator.cc \
+	third_party/webrtc/common_audio/lapped_transform.cc \
+	third_party/webrtc/common_audio/real_fourier.cc
 
 
 # Flags passed to both C and C++ files.
@@ -163,6 +167,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -273,6 +278,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/common_audio/common_audio.target.linux-x86_64.mk b/common_audio/common_audio.target.linux-x86_64.mk
index 5f9426e1..ff83cb94 100644
--- a/common_audio/common_audio.target.linux-x86_64.mk
+++ b/common_audio/common_audio.target.linux-x86_64.mk
@@ -24,6 +24,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS :=
 
 LOCAL_SRC_FILES := \
 	third_party/webrtc/common_audio/audio_util.cc \
+	third_party/webrtc/common_audio/blocker.cc \
 	third_party/webrtc/common_audio/fir_filter.cc \
 	third_party/webrtc/common_audio/resampler/push_resampler.cc \
 	third_party/webrtc/common_audio/resampler/push_sinc_resampler.cc \
@@ -69,7 +70,10 @@ LOCAL_SRC_FILES := \
 	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/wav_writer.cc \
+	third_party/webrtc/common_audio/window_generator.cc \
+	third_party/webrtc/common_audio/lapped_transform.cc \
+	third_party/webrtc/common_audio/real_fourier.cc
 
 
 # Flags passed to both C and C++ files.
@@ -162,6 +166,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -271,6 +276,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
 	$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
+	$(LOCAL_PATH)/third_party/openmax_dl \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport