Remove unneccessary variables in android makefiles.

3 files changed, 99 insertions, 113 deletions

diff --git a/android/jni/Core.mk b/android/jni/Core.mk
index 8e7bb16a..68d75757 100644
--- a/android/jni/Core.mk
+++ b/android/jni/Core.mk
@@ -4,10 +4,6 @@ include $(CLEAR_VARS)
 
 MY_ROOT := ../..
 
-OPENJPEG := openjpeg
-JPEG := jpeg
-ZLIB := zlib
-FREETYPE := freetype
 V8 := v8-3.9
 
 ifeq ($(TARGET_ARCH),arm)
@@ -23,16 +19,15 @@ endif
 
 LOCAL_C_INCLUDES := \
 	../thirdparty/jbig2dec \
-	../thirdparty/$(OPENJPEG)/src/lib/openjp2 \
-	../thirdparty/$(JPEG) \
-	../thirdparty/$(ZLIB) \
-	../thirdparty/$(FREETYPE)/include \
+	../thirdparty/openjpeg/src/lib/openjp2 \
+	../thirdparty/jpeg \
+	../thirdparty/zlib \
+	../thirdparty/freetype/include \
 	../draw \
 	../fitz \
 	../pdf \
 	../xps \
 	../cbz \
-	../image \
 	../ucdn \
 	../scripts \
 	..
diff --git a/android/jni/Core2.mk b/android/jni/Core2.mk
index d73ebaf2..b08751fe 100644
--- a/android/jni/Core2.mk
+++ b/android/jni/Core2.mk
@@ -4,10 +4,6 @@ include $(CLEAR_VARS)
 
 MY_ROOT := ../..
 
-OPENJPEG := openjpeg
-JPEG := jpeg
-ZLIB := zlib
-FREETYPE := freetype
 V8 := v8-3.9
 
 ifeq ($(TARGET_ARCH),arm)
@@ -24,10 +20,10 @@ endif
 
 LOCAL_C_INCLUDES := \
 	../thirdparty/jbig2dec \
-	../thirdparty/$(OPENJPEG)/src/lib/openjp2 \
-	../thirdparty/$(JPEG) \
-	../thirdparty/$(ZLIB) \
-	../thirdparty/$(FREETYPE)/include \
+	../thirdparty/openjpeg/src/lib/openjp2 \
+	../thirdparty/jpeg \
+	../thirdparty/zlib \
+	../thirdparty/freetype/include \
 	../draw \
 	../fitz \
 	../pdf \
diff --git a/android/jni/ThirdParty.mk b/android/jni/ThirdParty.mk
index a1a89be7..1a104b4b 100644
--- a/android/jni/ThirdParty.mk
+++ b/android/jni/ThirdParty.mk
@@ -4,17 +4,12 @@ include $(CLEAR_VARS)
 
 MY_ROOT := ../..
 
-OPENJPEG := openjpeg
-JPEG := jpeg
-ZLIB := zlib
-FREETYPE := freetype
-
 LOCAL_C_INCLUDES := \
 	../thirdparty/jbig2dec \
-	../thirdparty/$(OPENJPEG)/src/lib/openjp2 \
-	../thirdparty/$(JPEG) \
-	../thirdparty/$(ZLIB) \
-	../thirdparty/$(FREETYPE)/include \
+	../thirdparty/openjpeg/src/lib/openjp2 \
+	../thirdparty/jpeg \
+	../thirdparty/zlib \
+	../thirdparty/freetype/include \
 	../scripts
 
 LOCAL_CFLAGS := \
@@ -46,92 +41,92 @@ 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)/src/lib/openjp2/bio.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/cidx_manager.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/cio.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/dwt.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/event.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/function_list.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/image.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/invert.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/j2k.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/jp2.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/mct.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/mqc.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/openjpeg.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/opj_clock.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/phix_manager.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/pi.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/ppix_manager.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/raw.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/t1.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/t1_generate_luts.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/t2.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/tcd.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/tgt.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/thix_manager.c \
-	$(MY_ROOT)/thirdparty/$(OPENJPEG)/src/lib/openjp2/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
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/bio.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/cidx_manager.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/cio.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/dwt.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/event.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/function_list.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/image.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/invert.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/j2k.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/jp2.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/mct.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/mqc.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/openjpeg.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/opj_clock.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/phix_manager.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/pi.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/ppix_manager.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/raw.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/t1.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/t1_generate_luts.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/t2.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/tcd.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/tgt.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/thix_manager.c \
+	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/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)