aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-10-16 11:51:01 -0700
committerChih-Hung Hsieh <chh@google.com>2014-10-16 11:51:01 -0700
commit9f6aca34abc4842152e49fd553e357adc2f3f357 (patch)
tree0f4e8d7156f678f34a0e28cb6cdb3ac35887792e
parentef1b83013e7814622a9d11579878d342e84580b7 (diff)
downloadjpeg-9f6aca34abc4842152e49fd553e357adc2f3f357.tar.gz
Add -no-integrated-as at local level.
Later we will enable integrated-as as default at the global level. BUG: 17820427 Change-Id: I60f815a4e22cb157c240005e973f459da93cdb91
-rw-r--r--Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index b5905d1..a53d907 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,6 +13,9 @@ LOCAL_SRC_FILES := \
jfdctint.c jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c \
jquant2.c jutils.c jmemmgr.c armv6_idct.S
+# jsimd_arm_neon.S does not compile with clang.
+LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
+
ifeq (,$(TARGET_BUILD_APPS))
# building against master
# use ashmem as libjpeg decoder's backing store