commit 60c57dad4ec0653d9ce73f6f7147324beb1ce0a5
author Chih-Hung Hsieh <chh@google.com> Mon Oct 06 13:27:20 2014 -0700
committer Chih-Hung Hsieh <chh@google.com> Mon Oct 06 13:33:25 2014 -0700
tree 0f608d6ed0c2db6ad8855a5f5041689fd0c8894f
parent b1dd4af7c41dc0d73f9431ec7adabc342e13434e

Add -no-integrated-as at local level.

Later we will enable integrated-as as default at the global level.

BUG: 17820427
Change-Id: I1beed3e75d074d970fa9112ec1c0f0df3d43947a

libcutils/Android.mk

diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 469cdcf..6987e9c 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -121,6 +121,9 @@
 LOCAL_SRC_FILES_arm += \
         arch-arm/memset32.S \
 
+# arch-arm/memset32.S does not compile with Clang.
+LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
+
 LOCAL_SRC_FILES_arm64 += \
         arch-arm64/android_memset.S \