aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-10-09 22:07:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-09 22:07:08 +0000
commitd41a200bd1a7736cd6afe08ba0fe9618a74fe36e (patch)
tree7d46eea5d5ac5805c1e00b93dc09e09d0243c8a8
parent53d779af731f5353d02dd36f90259465c6846c2b (diff)
parent8fd3f61c995481e581d45719458ddc237fe35f83 (diff)
downloadwebrtc-d41a200bd1a7736cd6afe08ba0fe9618a74fe36e.tar.gz
am 8fd3f61c: Merge "Add -no-integrated-as at local level."
* commit '8fd3f61c995481e581d45719458ddc237fe35f83': Add -no-integrated-as at local level.
-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 c0b6fd5ab7..27285d7662 100644
--- a/src/modules/audio_processing/aecm/Android.mk
+++ b/src/modules/audio_processing/aecm/Android.mk
@@ -69,6 +69,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 := \