Minimize android ThirdParty.mk targets.

1 files changed, 14 insertions, 50 deletions

diff --git a/android/jni/ThirdParty.mk b/android/jni/ThirdParty.mk
index ef26d774..c80941d1 100644
--- a/android/jni/ThirdParty.mk
+++ b/android/jni/ThirdParty.mk
@@ -13,25 +13,27 @@ LOCAL_C_INCLUDES := \
 	../scripts
 
 LOCAL_CFLAGS := \
-	-DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON -DHAVE_STDINT_H
+	-DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON -DHAVE_STDINT_H \
+	'-DFT_CONFIG_MODULES_H="slimftmodules.h"' \
+	'-DFT_CONFIG_OPTIONS_H="slimftoptions.h"'
 
-LOCAL_MODULE    := mupdfthirdparty
+LOCAL_MODULE := mupdfthirdparty
 LOCAL_SRC_FILES := \
 	$(MY_ROOT)/thirdparty/jbig2dec/jbig2.c \
 	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_arith.c \
-	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_arith_int.c \
 	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_arith_iaid.c \
+	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_arith_int.c \
+	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_generic.c \
 	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_halftone.c \
 	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_huffman.c \
-	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_segment.c \
+	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_image.c \
+	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_metadata.c \
+	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_mmr.c \
 	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_page.c \
+	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_refinement.c \
+	$(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/jbig2dec/jbig2_generic.c \
-	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_refinement.c \
-	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_mmr.c \
-	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_image.c \
-	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_metadata.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 \
@@ -56,22 +58,7 @@ LOCAL_SRC_FILES := \
 	$(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/jcapimin.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jcapistd.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jcarith.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jccoefct.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jccolor.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jcdctmgr.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jchuff.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jcinit.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jcmainct.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jcmarker.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jcmaster.c \
 	$(MY_ROOT)/thirdparty/jpeg-8d/jcomapi.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jcparam.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jcprepct.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jcsample.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/jctrans.c \
 	$(MY_ROOT)/thirdparty/jpeg-8d/jdapimin.c \
 	$(MY_ROOT)/thirdparty/jpeg-8d/jdapistd.c \
 	$(MY_ROOT)/thirdparty/jpeg-8d/jdarith.c \
@@ -96,55 +83,34 @@ LOCAL_SRC_FILES := \
 	$(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/jpeg-8d/jmemmgr.c \
-	$(MY_ROOT)/thirdparty/jpeg-8d/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 \
 	$(MY_ROOT)/thirdparty/zlib-1.2.5/deflate.c \
-	$(MY_ROOT)/thirdparty/zlib-1.2.5/gzclose.c \
-	$(MY_ROOT)/thirdparty/zlib-1.2.5/gzlib.c \
-	$(MY_ROOT)/thirdparty/zlib-1.2.5/gzread.c \
-	$(MY_ROOT)/thirdparty/zlib-1.2.5/gzwrite.c \
-	$(MY_ROOT)/thirdparty/zlib-1.2.5/infback.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/autofit/autofit.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/ftbdf.c \
 	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftbitmap.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftdebug.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/ftgxval.c \
 	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftinit.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftlcdfil.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftmm.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftotval.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftpfr.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/ftwinfnt.c \
 	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftxf86.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/base/ftpatent.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/bdf/bdf.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/cache/ftcache.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/gzip/ftgzip.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/lzw/ftlzw.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/pcf/pcf.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/pfr/pfr.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 \
@@ -152,8 +118,6 @@ LOCAL_SRC_FILES := \
 	$(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/freetype-2.4.9/src/type42/type42.c \
-	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/winfonts/winfnt.c
+	$(MY_ROOT)/thirdparty/freetype-2.4.9/src/type1/type1.c
 
 include $(BUILD_STATIC_LIBRARY)