commit eae531fdfcf03e266a18f6a313d002aad58e0692
author Chih-Hung Hsieh <chh@google.com> Tue Oct 07 21:04:12 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 07 21:04:13 2014 +0000
tree 79852c43a720425b1e51b8ed8074aeda9b4a3016
parent 0c208f27a4832430cd16814f9a8455b64b932f81
parent e5b94f14847102def81bb5c040ed7cd742ff7128

Merge "Add -no-integrated-as at local level."

Android.mk

diff --git a/Android.mk b/Android.mk
index 42b3c48..fa349ce 100644
--- a/Android.mk
+++ b/Android.mk
@@ -661,6 +661,13 @@
 
 LOCAL_MODULE:= libskia
 
+# At least src/opts/memset16_neon.S does not compile with Clang.
+LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
+# At least src/opts/SkBitmapProcState_matrix_clamp_neon.h does not compile with Clang.
+LOCAL_CLANG_CFLAGS_arm += -no-integrated-as
+# At least src/opts/SkBlitRow_opts_arm_neon.cpp does not compile with Clang.
+LOCAL_CLANG_CFLAGS_arm64 += -no-integrated-as
+
 #include stlport headers
 include external/stlport/libstlport.mk