diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-11-19 00:21:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 00:21:48 +0000 |
| commit | 640228b8e0e537a527f2bb63a4f4d4b5a1ef29cd (patch) | |
| tree | 1f08bc0080cfa7efbb069e9997723c15e5b5251b /services | |
| parent | 9544a8e904955f4b96ec9f2d6f4edc2a72afd270 (diff) | |
| parent | 9b3238218cf24c75f92c5174e3a4edb8aff17047 (diff) | |
| download | frameworks_av-640228b8e0e537a527f2bb63a4f4d4b5a1ef29cd.zip frameworks_av-640228b8e0e537a527f2bb63a4f4d4b5a1ef29cd.tar.gz frameworks_av-640228b8e0e537a527f2bb63a4f4d4b5a1ef29cd.tar.bz2 | |
am 9b323821: am e4044209: Merge "Disable clang++ due to compiler error."
* commit '9b3238218cf24c75f92c5174e3a4edb8aff17047':
Disable clang++ due to compiler error.
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Android.mk | 6 | ||||
| -rw-r--r-- | services/audioflinger/tests/Android.mk | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 83211eb..f3290c6 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -23,6 +23,12 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) +# Clang++ aborts on AudioMixer.cpp, +# b/18373866, "do not know how to split this operator." +ifeq ($(filter $(TARGET_ARCH),arm arm64),$(TARGET_ARCH)) + LOCAL_CLANG := false +endif + LOCAL_SRC_FILES:= \ AudioFlinger.cpp \ Threads.cpp \ diff --git a/services/audioflinger/tests/Android.mk b/services/audioflinger/tests/Android.mk index 8935981..8604ef5 100644 --- a/services/audioflinger/tests/Android.mk +++ b/services/audioflinger/tests/Android.mk @@ -30,6 +30,12 @@ include $(BUILD_NATIVE_TEST) # include $(CLEAR_VARS) +# Clang++ aborts on AudioMixer.cpp, +# b/18373866, "do not know how to split this operator." +ifeq ($(filter $(TARGET_ARCH),arm arm64),$(TARGET_ARCH)) + LOCAL_CLANG := false +endif + LOCAL_SRC_FILES:= \ test-mixer.cpp \ ../AudioMixer.cpp.arm \ |