diff options
| author | Matt Sarett <msarett@google.com> | 2015-11-06 17:05:31 -0500 |
|---|---|---|
| committer | Matt Sarett <msarett@google.com> | 2015-11-09 09:34:46 -0500 |
| commit | 14b47d156ccec073b90c57fef3c97fcde8173e52 (patch) | |
| tree | aefaf08832d45918077b4f7b0be0f532f1c67919 | |
| parent | f37632abbda730936f05d9be90fea8f21015e087 (diff) | |
| download | libjpeg-turbo-14b47d156ccec073b90c57fef3c97fcde8173e52.tar.gz | |
Further build fixes for x86, x86_64, and mips
Change-Id: Ia2b983a15a7fc12d0f47c338f831d5de6e8de75b
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -31,16 +31,20 @@ ifeq ($(strip $(TARGET_ARCH)),arm) endif # ARM v8 64-bit NEON -# TODO (msarett): Figure out why this won't compile on Nexus 9. +# TODO (msarett): Figure out why we can't compile NEON on Nexus 9. LOCAL_SRC_FILES_arm64 += jsimd_none.c # TODO (msarett): x86 and x86_64 SIMD. Cross-compiling these assembly files # on Linux for Android is very tricky. This will require a # YASM or NASM as a dependency. +LOCAL_SRC_FILES_x86 += jsimd_none.c +LOCAL_SRC_FILES_x86_64 += jsimd_none.c # TODO (msarett): MIPS SIMD. This is available in upstream libjpeg-turbo, # but has not been cherry picked into the version used by # Android. +LOCAL_SRC_FILES_mips += jsimd_none.c +LOCAL_SRC_FILES_mips64 += jsimd_none.c LOCAL_CFLAGS += -O3 -fstrict-aliasing LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) |