diff options
| author | Victor Khimenko <khim@google.com> | 2016-10-18 20:56:13 +0200 |
|---|---|---|
| committer | Victor Khimenko <khim@google.com> | 2016-10-18 20:57:44 +0200 |
| commit | 33d86be80eba3934aac37ac3def928da1d2707ad (patch) | |
| tree | b3b5a1d854e1efdaad5c011333e52de41f8ee0da | |
| parent | 0c90af915340abb4755ff3b8e1a6584ccb68f2ad (diff) | |
| download | webrtc-33d86be80eba3934aac37ac3def928da1d2707ad.tar.gz | |
Use arch-specific variables
This fixes x86+arm multilib build.
Bug: 27526885
Test: Build system refactoring CL. Existing unit tests still pass.
Change-Id: I7290198a3671af3688cf125ffb1e6979344c0a8d
| -rw-r--r-- | webrtc/common_audio/Android.mk | 5 | ||||
| -rw-r--r-- | webrtc/common_audio/resampler/Android.mk | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/webrtc/common_audio/Android.mk b/webrtc/common_audio/Android.mk index ab1b706c94..b3e58976e4 100644 --- a/webrtc/common_audio/Android.mk +++ b/webrtc/common_audio/Android.mk @@ -32,9 +32,8 @@ LOCAL_SRC_FILES := \ sparse_fir_filter.cc \ window_generator.cc \ -ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH),x86 x86_64)) -LOCAL_SRC_FILES += fir_filter_sse.cc -endif +LOCAL_SRC_FILES_x86 += fir_filter_sse.cc +LOCAL_SRC_FILES_x86_64 += fir_filter_sse.cc # Flags passed to both C and C++ files. LOCAL_CFLAGS := \ diff --git a/webrtc/common_audio/resampler/Android.mk b/webrtc/common_audio/resampler/Android.mk index ecf2a6a8cf..b9feb483d1 100644 --- a/webrtc/common_audio/resampler/Android.mk +++ b/webrtc/common_audio/resampler/Android.mk @@ -22,9 +22,8 @@ LOCAL_SRC_FILES := \ resampler.cc \ sinc_resampler.cc \ -ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH),x86 x86_64)) -LOCAL_SRC_FILES += sinc_resampler_sse.cc -endif +LOCAL_SRC_FILES_x86 += sinc_resampler_sse.cc +LOCAL_SRC_FILES_x86_64 += sinc_resampler_sse.cc # Flags passed to both C and C++ files. LOCAL_CFLAGS := \ |