diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-16 21:02:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-16 21:02:58 +0000 |
| commit | 57cc16e38e6461da4317c285eec61c3265e516bf (patch) | |
| tree | 0f4e8d7156f678f34a0e28cb6cdb3ac35887792e | |
| parent | 6227b1ce18f7a45203a72102b75f891eddc8d7d1 (diff) | |
| parent | a66efb5d9a21e2666099dffb234b774d796cefbd (diff) | |
| download | jpeg-57cc16e38e6461da4317c285eec61c3265e516bf.tar.gz | |
am a66efb5d: Merge "Add -no-integrated-as at local level."
* commit 'a66efb5d9a21e2666099dffb234b774d796cefbd':
Add -no-integrated-as at local level.
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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 |