zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use arch-specific variables

Browse Source 
This fixes x86+arm multilib build.

Bug: 27526885
Test: Build system refactoring CL. Existing unit tests still pass.

Change-Id: I7290198a3671af3688cf125ffb1e6979344c0a8d
This commit is contained in:
Victor Khimenko
2016-10-18 20:56:13 +02:00
parent 0c90af9153
commit 33d86be80e
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/common_audio/Android.mk
View File

@ -32,9 +32,8 @@ LOCAL_SRC_FILES := \
sparse_fir_filter.cc \ sparse_fir_filter.cc \
window_generator.cc \ window_generator.cc \
ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH),x86 x86_64)) LOCAL_SRC_FILES_x86 += fir_filter_sse.cc
LOCAL_SRC_FILES += fir_filter_sse.cc LOCAL_SRC_FILES_x86_64 += fir_filter_sse.cc
endif
# Flags passed to both C and C++ files. # Flags passed to both C and C++ files.
LOCAL_CFLAGS := \ LOCAL_CFLAGS := \

5
webrtc/common_audio/resampler/Android.mk
View File

@ -22,9 +22,8 @@ LOCAL_SRC_FILES := \
resampler.cc \ resampler.cc \
sinc_resampler.cc \ sinc_resampler.cc \
ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH),x86 x86_64)) LOCAL_SRC_FILES_x86 += sinc_resampler_sse.cc
LOCAL_SRC_FILES += sinc_resampler_sse.cc LOCAL_SRC_FILES_x86_64 += sinc_resampler_sse.cc
endif
# Flags passed to both C and C++ files. # Flags passed to both C and C++ files.
LOCAL_CFLAGS := \ LOCAL_CFLAGS := \