aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Hamilton <jham@android.com>2010-09-15 23:37:16 -0500
committerJeff Hamilton <jham@android.com>2010-09-16 00:09:37 -0500
commit5de41a6c00cc5779275aa9f132872a944f3a2b3b (patch)
treeae2aca8af64d61a0ed6b3a94888d4cb73125159a
parentf71323e297a928af368937089d3ed71239786f86 (diff)
downloadlibvpx-5de41a6c00cc5779275aa9f132872a944f3a2b3b.tar.gz
Attempt to fix the build.
On targets without neon it looks like idct_blk.c is needed to provide some symbols that come from NEON optimized ASM. Change-Id: I223071ce60ca7fde59160854fc1a71211f049a81
-rw-r--r--Android.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 8af6e5e06..a475016cd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,7 +51,7 @@ LOCAL_SRC_FILES = \
vp8/decoder/threading.c \
vp8/vp8_dx_iface.c \
vpx_config.c \
- vp8/decoder/arm/neon/idct_blk_neon.c \
+ vp8/decoder/arm/neon/idct_blk_neon.c
LOCAL_CFLAGS := \
-DHAVE_CONFIG_H=vpx_config.h
@@ -114,6 +114,10 @@ $(VPX_GEN) : $(intermediates)/%.s : $(LOCAL_PATH)/%.asm
LOCAL_GENERATED_SOURCES += $(VPX_GEN)
+else
+
+LOCAL_SRC_FILES += vp8/decoder/idct_blk.c
+
endif
LOCAL_C_INCLUDES := \