diff options
| author | Matt Sarett <msarett@google.com> | 2015-11-30 14:26:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-11-30 14:26:50 +0000 |
| commit | c34a7cc278ebe957100dfa9bcba690bfa91b0762 (patch) | |
| tree | 040a001a94da60ce79f3c25478a884e3954f74b8 | |
| parent | dacf5b3a7ac23f50770aa7315c8ef55c3a95f76b (diff) | |
| parent | cba44a94921ecaad5c69915aa76a2ee76d4d663a (diff) | |
| download | libjpeg-turbo-c34a7cc278ebe957100dfa9bcba690bfa91b0762.tar.gz | |
Merge "Fix x86 and x86_64 builds by specifying LOCAL_C_INCLUDES"
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -52,6 +52,7 @@ LOCAL_SRC_FILES_x86 += \ simd/jidctred-sse2.asm simd/jquant-3dn.asm simd/jquantf-sse2.asm \ simd/jquanti-sse2.asm simd/jquant-mmx.asm simd/jquant-sse.asm \ simd/jsimdcpu.asm +LOCAL_C_INCLUDES_x86 += $(LOCAL_PATH)/simd # x86-64 SSE2 LOCAL_SRC_FILES_x86_64 += \ @@ -64,6 +65,7 @@ LOCAL_SRC_FILES_x86_64 += \ simd/jidctred-sse2-64.asm simd/jquantf-sse2-64.asm \ simd/jquanti-sse2-64.asm LOCAL_ASFLAGS_x86_64 += -D__x86_64__ +LOCAL_C_INCLUDES_x86_64 += $(LOCAL_PATH)/simd # TODO (msarett): Compile MIPS SIMD. LOCAL_SRC_FILES_mips += jsimd_none.c |