commit 88063ca54bc064fedb836fa020b699f8c61ce6ed
author Chih-Hung Hsieh <chh@google.com> Fri May 15 23:32:57 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 15 23:32:57 2015 +0000
tree 872820901f4c0da447d54ba7cfe3cc1f409efed5
parent f71f5afcd87e8037350f8630e6d40da0a9b2aa60
parent 926ac73529a3b1fc614f8e7f1b2ed35564fc51e6

Merge changes Ia529bf53,I10888d0b into mnc-dev

* changes:
  Enable building with clang/llvm.
  Enable clang compilation.

services/audioflinger/Android.mk

diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk
index c359be5..debcdf9 100644
--- a/services/audioflinger/Android.mk
+++ b/services/audioflinger/Android.mk
@@ -29,12 +29,6 @@
 
 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                 \

services/audioflinger/tests/Android.mk

diff --git a/services/audioflinger/tests/Android.mk b/services/audioflinger/tests/Android.mk
index 536eb93..e152468 100644
--- a/services/audioflinger/tests/Android.mk
+++ b/services/audioflinger/tests/Android.mk
@@ -30,12 +30,6 @@
 #
 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 \