summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorRobin Watts <robin.watts@artifex.com>2012-01-06 18:55:50 +0000
committerRobin Watts <robin.watts@artifex.com>2012-01-06 18:55:50 +0000
commit1ef1a581229dfc0b0466600bb8bc01b3109be02f (patch)
tree56e847973641a7c35d1b266da0599810e4e8182d /android
parentd6fab6582c26c133589c83134e76e7a29ff57962 (diff)
downloadmupdf-1ef1a581229dfc0b0466600bb8bc01b3109be02f.tar.xz
Android tweaks.
Include android headers in fitz.h so we can debug. Arrange for error throwing to output to android error stream as well as stderr. Change jpeg library to not use backing store. Solves bug 692473.
Diffstat (limited to 'android')
-rw-r--r--android/jni/ThirdParty.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/jni/ThirdParty.mk b/android/jni/ThirdParty.mk
index 2a50b05f..0ea140c3 100644
--- a/android/jni/ThirdParty.mk
+++ b/android/jni/ThirdParty.mk
@@ -94,7 +94,7 @@ LOCAL_SRC_FILES := \
$(MY_ROOT)/thirdparty/jpeg-8c/jquant2.c \
$(MY_ROOT)/thirdparty/jpeg-8c/jutils.c \
$(MY_ROOT)/thirdparty/jpeg-8c/jmemmgr.c \
- $(MY_ROOT)/thirdparty/jpeg-8c/jmemansi.c \
+ $(MY_ROOT)/thirdparty/jpeg-8c/jmemnobs.c \
$(MY_ROOT)/thirdparty/zlib-1.2.5/adler32.c \
$(MY_ROOT)/thirdparty/zlib-1.2.5/compress.c \
$(MY_ROOT)/thirdparty/zlib-1.2.5/crc32.c \