Fix android build after last thirdparty update

2 files changed, 103 insertions, 93 deletions

diff --git a/android/jni/Core.mk b/android/jni/Core.mk
index cea16e74..69fcef49 100644
--- a/android/jni/Core.mk
+++ b/android/jni/Core.mk
@@ -4,14 +4,19 @@ include $(CLEAR_VARS)
 
 MY_ROOT := ../..
 
+OPENJPEG := openjpeg-1.5.0-patched
+JPEG := jpeg-9
+ZLIB := zlib-1.2.7
+FREETYPE := freetype-2.4.10
+
 LOCAL_CFLAGS += -DARCH_ARM -DARCH_THUMB -DARCH_ARM_CAN_LOAD_UNALIGNED
 
 LOCAL_C_INCLUDES := \
 	../thirdparty/jbig2dec \
-	../thirdparty/openjpeg-1.5.0/libopenjpeg \
-	../thirdparty/jpeg-8d \
-	../thirdparty/zlib-1.2.5 \
-	../thirdparty/freetype-2.4.9/include \
+	../thirdparty/$(OPENJPEG)/libopenjpeg \
+	../thirdparty/$(JPEG) \
+	../thirdparty/$(ZLIB) \
+	../thirdparty/$(FREETYPE)/include \
 	../draw \
 	../fitz \
 	../pdf \
diff --git a/android/jni/ThirdParty.mk b/android/jni/ThirdParty.mk
index c80941d1..a2d05ccf 100644
--- a/android/jni/ThirdParty.mk
+++ b/android/jni/ThirdParty.mk
@@ -4,12 +4,17 @@ include $(CLEAR_VARS)
 
 MY_ROOT := ../..
 
+OPENJPEG := openjpeg-1.5.0-patched
+JPEG := jpeg-9
+ZLIB := zlib-1.2.7
+FREETYPE := freetype-2.4.10
+
 LOCAL_C_INCLUDES := \
 	../thirdparty/jbig2dec \
-	../thirdparty/openjpeg-1.5.0/libopenjpeg \
-	../thirdparty/jpeg-8d \
-	../thirdparty/zlib-1.2.5 \
-	../thirdparty/freetype-2.4.9/include \
+	../thirdparty/$(OPENJPEG)/libopenjpeg \
+	../thirdparty/$(JPEG) \
+	../thirdparty/$(ZLIB) \
+	../thirdparty/$(FREETYPE)/include \
 	../scripts
 
 LOCAL_CFLAGS := \
@@ -34,90 +39,90 @@ LOCAL_SRC_FILES := \
 	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_segment.c \
 	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_symbol_dict.c \
 	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_text.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/bio.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/cidx_manager.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/cio.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/dwt.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/event.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/image.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/j2k.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/j2k_lib.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/jp2.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/jpt.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/mct.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/mqc.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/openjpeg.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/phix_manager.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/pi.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/ppix_manager.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/raw.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/t1.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/t2.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/tcd.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/tgt.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/thix_manager.c \
-	$(MY_ROOT)/thirdparty/openjpeg-1.5.0/libopenjpeg/tpix_manager.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jaricom.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jcomapi.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jdapimin.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jdapistd.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jdarith.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jdatadst.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jdatasrc.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jdcoefct.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jdcolor.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jddctmgr.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jdhuff.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jdinput.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jdmainct.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jdmarker.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jdmaster.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jdmerge.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jdpostct.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jdsample.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jdtrans.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jerror.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jfdctflt.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jfdctfst.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jfdctint.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jidctflt.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jidctfst.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jidctint.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jmemmgr.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jmemnobs.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jquant1.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jquant2.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jutils.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 \
-	$(MY_ROOT)/thirdparty/zlib-1.2.5/deflate.c \
-	$(MY_ROOT)/thirdparty/zlib-1.2.5/inffast.c \
-	$(MY_ROOT)/thirdparty/zlib-1.2.5/inflate.c \
-	$(MY_ROOT)/thirdparty/zlib-1.2.5/inftrees.c \
-	$(MY_ROOT)/thirdparty/zlib-1.2.5/trees.c \
-	$(MY_ROOT)/thirdparty/zlib-1.2.5/uncompr.c \
-	$(MY_ROOT)/thirdparty/zlib-1.2.5/zutil.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftbase.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftbbox.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftbitmap.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftgasp.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftglyph.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftinit.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftstroke.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftsynth.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftsystem.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/fttype1.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftxf86.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/cff/cff.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/cid/type1cid.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/psaux/psaux.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/pshinter/pshinter.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/psnames/psnames.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/raster/raster.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/smooth/smooth.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/sfnt/sfnt.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/truetype/truetype.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/type1/type1.c
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/bio.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/cidx_manager.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/cio.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/dwt.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/event.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/image.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/j2k.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/j2k_lib.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/jp2.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/jpt.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/mct.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/mqc.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/openjpeg.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/phix_manager.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/pi.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/ppix_manager.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/raw.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/t1.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/t2.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/tcd.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/tgt.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/thix_manager.c \
+	$(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/tpix_manager.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jaricom.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jcomapi.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jdapimin.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jdapistd.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jdarith.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jdatadst.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jdatasrc.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jdcoefct.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jdcolor.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jddctmgr.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jdhuff.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jdinput.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jdmainct.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jdmarker.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jdmaster.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jdmerge.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jdpostct.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jdsample.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jdtrans.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jerror.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jfdctflt.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jfdctfst.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jfdctint.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jidctflt.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jidctfst.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jidctint.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jmemmgr.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jmemnobs.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jquant1.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jquant2.c \
+	$(MY_ROOT)/thirdparty/$(JPEG)/jutils.c \
+	$(MY_ROOT)/thirdparty/$(ZLIB)/adler32.c \
+	$(MY_ROOT)/thirdparty/$(ZLIB)/compress.c \
+	$(MY_ROOT)/thirdparty/$(ZLIB)/crc32.c \
+	$(MY_ROOT)/thirdparty/$(ZLIB)/deflate.c \
+	$(MY_ROOT)/thirdparty/$(ZLIB)/inffast.c \
+	$(MY_ROOT)/thirdparty/$(ZLIB)/inflate.c \
+	$(MY_ROOT)/thirdparty/$(ZLIB)/inftrees.c \
+	$(MY_ROOT)/thirdparty/$(ZLIB)/trees.c \
+	$(MY_ROOT)/thirdparty/$(ZLIB)/uncompr.c \
+	$(MY_ROOT)/thirdparty/$(ZLIB)/zutil.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/base/ftbase.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/base/ftbbox.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/base/ftbitmap.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/base/ftgasp.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/base/ftglyph.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/base/ftinit.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/base/ftstroke.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/base/ftsynth.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/base/ftsystem.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/base/fttype1.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/base/ftxf86.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/cff/cff.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/cid/type1cid.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/psaux/psaux.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/pshinter/pshinter.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/psnames/psnames.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/raster/raster.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/smooth/smooth.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/sfnt/sfnt.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/truetype/truetype.c \
+	$(MY_ROOT)/thirdparty/$(FREETYPE)/src/type1/type1.c
 
 include $(BUILD_STATIC_LIBRARY)