Compile x86 and x86-64 assembly with appropriate compiler flags

This provides ~2.5x speed-up on full image decodes.

BUG:25815224
BUG:25641008
Change-Id: I3ce188d371c5e41ebc810dbc810ac460be3b5074

1 files changed, 26 insertions, 36 deletions

diff --git a/Android.mk b/Android.mk
index e45da826..2801805f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,45 +34,35 @@ endif
 LOCAL_SRC_FILES_arm64 += simd/jsimd_arm64_neon.S simd/jsimd_arm64.c
 
 # x86 MMX and SSE2
-# FIXME: BUG 26023491
-ifeq (true, true)
-  LOCAL_SRC_FILES_x86 += jsimd_none.c
-else
-  LOCAL_SRC_FILES_x86 += \
-        simd/jsimd_i386.c simd/jccolor-mmx.asm simd/jccolor-sse2.asm \
-        simd/jcgray-mmx.asm  simd/jcgray-sse2.asm simd/jcsample-mmx.asm \
-        simd/jcsample-sse2.asm simd/jdcolor-mmx.asm simd/jdcolor-sse2.asm \
-        simd/jdmerge-mmx.asm simd/jdmerge-sse2.asm simd/jdsample-mmx.asm \
-        simd/jdsample-sse2.asm simd/jfdctflt-3dn.asm simd/jfdctflt-sse.asm \
-        simd/jfdctfst-mmx.asm simd/jfdctfst-sse2.asm simd/jfdctint-mmx.asm \
-        simd/jfdctint-sse2.asm simd/jidctflt-3dn.asm simd/jidctflt-sse2.asm \
-        simd/jidctflt-sse.asm simd/jidctfst-mmx.asm simd/jidctfst-sse2.asm \
-        simd/jidctint-mmx.asm simd/jidctint-sse2.asm simd/jidctred-mmx.asm \
-        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
-endif
+LOCAL_SRC_FILES_x86 += \
+      simd/jsimd_i386.c simd/jccolor-mmx.asm simd/jccolor-sse2.asm \
+      simd/jcgray-mmx.asm  simd/jcgray-sse2.asm simd/jcsample-mmx.asm \
+      simd/jcsample-sse2.asm simd/jdcolor-mmx.asm simd/jdcolor-sse2.asm \
+      simd/jdmerge-mmx.asm simd/jdmerge-sse2.asm simd/jdsample-mmx.asm \
+      simd/jdsample-sse2.asm simd/jfdctflt-3dn.asm simd/jfdctflt-sse.asm \
+      simd/jfdctfst-mmx.asm simd/jfdctfst-sse2.asm simd/jfdctint-mmx.asm \
+      simd/jfdctint-sse2.asm simd/jidctflt-3dn.asm simd/jidctflt-sse2.asm \
+      simd/jidctflt-sse.asm simd/jidctfst-mmx.asm simd/jidctfst-sse2.asm \
+      simd/jidctint-mmx.asm simd/jidctint-sse2.asm simd/jidctred-mmx.asm \
+      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_ASFLAGS_x86 += -DPIC -DELF
+LOCAL_C_INCLUDES_x86 += $(LOCAL_PATH)/simd
 
 # x86-64 SSE2
-# FIXME: BUG 26023491
-ifeq (true, true)
-  LOCAL_SRC_FILES_x86_64 += jsimd_none.c
-else
-  LOCAL_SRC_FILES_x86_64 += \
-        simd/jsimd_x86_64.c simd/jccolor-sse2-64.asm simd/jcgray-sse2-64.asm \
-        simd/jcsample-sse2-64.asm simd/jdcolor-sse2-64.asm \
-        simd/jdmerge-sse2-64.asm simd/jdsample-sse2-64.asm \
-        simd/jfdctflt-sse-64.asm simd/jfdctfst-sse2-64.asm \
-        simd/jfdctint-sse2-64.asm simd/jidctflt-sse2-64.asm \
-        simd/jidctfst-sse2-64.asm simd/jidctint-sse2-64.asm \
-        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
-endif
+LOCAL_SRC_FILES_x86_64 += \
+      simd/jsimd_x86_64.c simd/jccolor-sse2-64.asm simd/jcgray-sse2-64.asm \
+      simd/jcsample-sse2-64.asm simd/jdcolor-sse2-64.asm \
+      simd/jdmerge-sse2-64.asm simd/jdsample-sse2-64.asm \
+      simd/jfdctflt-sse-64.asm simd/jfdctfst-sse2-64.asm \
+      simd/jfdctint-sse2-64.asm simd/jidctflt-sse2-64.asm \
+      simd/jidctfst-sse2-64.asm simd/jidctint-sse2-64.asm \
+      simd/jidctred-sse2-64.asm simd/jquantf-sse2-64.asm \
+      simd/jquanti-sse2-64.asm
+LOCAL_ASFLAGS_x86_64 += -D__x86_64__ -DPIC -DELF
+LOCAL_C_INCLUDES_x86_64 += $(LOCAL_PATH)/simd
 
-# TODO (msarett): Compile MIPS SIMD.
 LOCAL_SRC_FILES_mips += jsimd_none.c
 LOCAL_SRC_FILES_mips64 += jsimd_none.c