diff options
| author | Matt Sarett <msarett@google.com> | 2015-11-11 11:34:42 -0500 |
|---|---|---|
| committer | Matt Sarett <msarett@google.com> | 2015-11-11 11:34:42 -0500 |
| commit | 8488d01e90bb6b3fb83e505ecd5125ee208d7a12 (patch) | |
| tree | 8e0903d65976d0979974d5d8c6fe1c97b0972652 /Android.mk | |
| parent | 14b47d156ccec073b90c57fef3c97fcde8173e52 (diff) | |
| download | libjpeg-turbo-8488d01e90bb6b3fb83e505ecd5125ee208d7a12.tar.gz | |
Reenable ARM v8 NEON optimizations
For now we can get around the compile problems by using gcc.
We should follow up with clang to see about fixing these issues.
BUG:25564571
Change-Id: I573e02b19aaa4c3e59e4bd287502068cda49efb4
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -9,6 +9,11 @@ include $(CLEAR_VARS) # preferred to thumb mode for libjpeg-turbo. LOCAL_ARM_MODE := arm +# BUG:25564571 +# Clang fails to compile the ARM v8 NEON asembly, and libjpeg-turbo may perform +# better when compiled with gcc. +LOCAL_CLANG := false + LOCAL_SRC_FILES := \ jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c \ jcinit.c jcmainct.c jcmarker.c jcmaster.c jcomapi.c jcparam.c \ @@ -31,8 +36,7 @@ ifeq ($(strip $(TARGET_ARCH)),arm) endif # ARM v8 64-bit NEON -# TODO (msarett): Figure out why we can't compile NEON on Nexus 9. -LOCAL_SRC_FILES_arm64 += jsimd_none.c +LOCAL_SRC_FILES_arm64 += simd/jsimd_arm64_neon.S simd/jsimd_arm64.c # TODO (msarett): x86 and x86_64 SIMD. Cross-compiling these assembly files # on Linux for Android is very tricky. This will require a |