aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-10-09 21:06:12 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-10-09 21:06:12 +0000
commit8fd3f61c995481e581d45719458ddc237fe35f83 (patch)
treeea3ed23ae343c494bbbfbab21e2c141f304ad0b5
parent84a1738586b1f041adec40fa593eafea51f69fb8 (diff)
parenta0f8c621a2512a039074b9151e4ac3bfc2a6f6cc (diff)
downloadwebrtc-8fd3f61c995481e581d45719458ddc237fe35f83.tar.gz
Merge "Add -no-integrated-as at local level."android-l-preview_r2l-preview
-rw-r--r--src/modules/audio_processing/aecm/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/audio_processing/aecm/Android.mk b/src/modules/audio_processing/aecm/Android.mk
index fff8f52a98..db9aa741b2 100644
--- a/src/modules/audio_processing/aecm/Android.mk
+++ b/src/modules/audio_processing/aecm/Android.mk
@@ -73,6 +73,8 @@ LOCAL_MODULE := libwebrtc_aecm_neon
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := aecm_core_neon.c
+# Assembly code in aecm_core_neon.c does not compile with Clang.
+LOCAL_CLANG_CFLAGS_arm += -no-integrated-as
# Flags passed to both C and C++ files.
LOCAL_CFLAGS := \