aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Sarett <msarett@google.com>2015-11-30 08:54:46 -0500
committerMatt Sarett <msarett@google.com>2015-11-30 08:54:46 -0500
commitcba44a94921ecaad5c69915aa76a2ee76d4d663a (patch)
tree4ab07e7ff18d19dac3c90710e753d32c26f2b6ba
parentb3ffc5a2fb2b2f03b77b91e29d7d505340af0ecb (diff)
downloadlibjpeg-turbo-cba44a94921ecaad5c69915aa76a2ee76d4d663a.tar.gz
Fix x86 and x86_64 builds by specifying LOCAL_C_INCLUDES
I must have accidentally dropped this line from the previous commit: https://googleplex-android-review.git.corp.google.com/#/c/818568/ Change-Id: I0c19a01bdd588a88e13acfdea6df299dd839f780
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 7be0fab4..883a2a75 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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