diff options
| author | Victor Khimenko <khim@google.com> | 2016-10-19 19:45:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-19 19:45:31 +0000 |
| commit | 3f1ab425f5c22acf044c61ee209a209de4043537 (patch) | |
| tree | b3b5a1d854e1efdaad5c011333e52de41f8ee0da | |
| parent | d06cfc87422df527d1b7aa342a6c45e24f3d7690 (diff) | |
| parent | b33ba455c4b07b719bf1982ad3e2121709be1c62 (diff) | |
| download | webrtc-3f1ab425f5c22acf044c61ee209a209de4043537.tar.gz | |
Merge "Use arch-specific variables"android-n-mr2-preview-1
am: b33ba455c4
Change-Id: I9d47a4379da6c4c88c0847c8fca6d4a2c799ca15
| -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 := \ |