diff options
| author | Victor Khimenko <khim@google.com> | 2016-10-19 20:08:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-19 20:08:59 +0000 |
| commit | 3accb2262d6ba72c8a985017c3f4f38cc7e2ca62 (patch) | |
| tree | 3692a3277314f1088078bd2c01ae7151dd6f0257 | |
| parent | 2c7ba826b380837113a53ec12cc08fd1a7366056 (diff) | |
| parent | c55415d27b3bb1a467a91a8e76beb9506dcf8614 (diff) | |
| download | webrtc-3accb2262d6ba72c8a985017c3f4f38cc7e2ca62.tar.gz | |
Merge "Use arch-specific variables" am: b33ba455c4 am: 3f1ab425f5
am: c55415d27b
Change-Id: Ia1b9be2f0ccc56ead8f3efb35f11a667abc80d2f
| -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 := \ |